Merge pull request #902 from oracle/hear-again

Handle watch status that is missing or for 410 doesn't include good resource version

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/Watcher.java

@@ -187,17 +187,31 @@ private void handleRegularUpdate(Watch.Response<T> item) {
 
   private void handleErrorResponse(Watch.Response<T> item) {
     V1Status status = item.status;
-    if (status != null && status.getCode() == HTTP_GONE) {
-      String message = status.getMessage();
+    if (status == null) {
+      // The kubernetes client parsing logic can mistakenly parse a status as a type
+      // with similar fields, such as V1ConfigMap. In this case, the actual status is
+      // not available to our layer, so respond defensively by resetting resource version.
+      resourceVersion = 0l;
+    } else if (status.getCode() == HTTP_GONE) {
+      resourceVersion = computeNextResourceVersionFromMessage(status);
+    }
+  }
+
+  private long computeNextResourceVersionFromMessage(V1Status status) {
+    String message = status.getMessage();
+    if (message != null) {
       int index1 = message.indexOf('(');
       if (index1 > 0) {
         int index2 = message.indexOf(')', index1 + 1);
         if (index2 > 0) {
           String val = message.substring(index1 + 1, index2);
-          resourceVersion = !isNullOrEmptyString(val) ? Long.parseLong(val) : 0;
+          if (!isNullOrEmptyString(val)) {
+            return Long.parseLong(val);
+          }
         }
       }
     }
+    return 0l;
   }
 
   /**

operator/src/test/java/oracle/kubernetes/operator/WatcherTestBase.java

@@ -107,6 +107,14 @@ private Watch.Response createHttpGoneErrorResponse(int nextResourceVersion) {
     return WatchEvent.createErrorEvent(HTTP_GONE, nextResourceVersion).toWatchResponse();
   }
 
+  private Watch.Response createHttpGoneErrorWithoutResourceVersionResponse() {
+    return WatchEvent.createErrorEvent(HTTP_GONE).toWatchResponse();
+  }
+
+  private Watch.Response createErrorWithoutStatusResponse() {
+    return WatchEvent.createErrorEventWithoutStatus().toWatchResponse();
+  }
+
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
   public void receivedEvents_areSentToListeners() {
@@ -138,18 +146,36 @@ public void afterFirstSetOfEvents_nextRequestSendsLastResourceVersion() {
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
   public void afterHttpGoneError_nextRequestSendsIncludedResourceVersion() {
-    try {
-      StubWatchFactory.addCallResponses(createHttpGoneErrorResponse(NEXT_RESOURCE_VERSION));
-      scheduleDeleteResponse(createObjectWithMetaData());
-
-      createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
-
-      assertThat(
-          StubWatchFactory.getRequestParameters().get(1),
-          hasEntry("resourceVersion", Integer.toString(NEXT_RESOURCE_VERSION)));
-    } catch (Throwable t) {
-      t.printStackTrace();
-    }
+    StubWatchFactory.addCallResponses(createHttpGoneErrorResponse(NEXT_RESOURCE_VERSION));
+    scheduleDeleteResponse(createObjectWithMetaData());
+
+    createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
+
+    assertThat(
+        StubWatchFactory.getRequestParameters().get(1),
+        hasEntry("resourceVersion", Integer.toString(NEXT_RESOURCE_VERSION)));
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  @Test
+  public void afterHttpGoneErrorWithoutResourceVersion_nextRequestSendsResourceVersionZero() {
+    StubWatchFactory.addCallResponses(createHttpGoneErrorWithoutResourceVersionResponse());
+    scheduleDeleteResponse(createObjectWithMetaData());
+
+    createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
+
+    assertThat(StubWatchFactory.getRequestParameters().get(1), hasEntry("resourceVersion", "0"));
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  @Test
+  public void afterErrorWithoutStatus_nextRequestSendsResourceVersionZero() {
+    StubWatchFactory.addCallResponses(createErrorWithoutStatusResponse());
+    scheduleDeleteResponse(createObjectWithMetaData());
+
+    createAndRunWatcher(NAMESPACE, stopping, INITIAL_RESOURCE_VERSION);
+
+    assertThat(StubWatchFactory.getRequestParameters().get(1), hasEntry("resourceVersion", "0"));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})

operator/src/test/java/oracle/kubernetes/operator/builders/WatchEvent.java

@@ -48,6 +48,10 @@ public static <S> WatchEvent<S> createDeleteEvent(S object) {
     return new WatchEvent<>("DELETED", object);
   }
 
+  public static <S> WatchEvent<S> createErrorEventWithoutStatus() {
+    return new WatchEvent<>(null);
+  }
+
   public static <S> WatchEvent<S> createErrorEvent(int statusCode) {
     return new WatchEvent<>(new V1Status().code(statusCode).message("Oops"));
   }