Merge pull request #962 from yue9944882/defensive-reconciler-execution

Catches runtime-exception upon executing reconciler

Author: k8s-ci-robot

extended/src/main/java/io/kubernetes/client/extended/controller/DefaultController.java

@@ -151,7 +151,13 @@ private void worker() {
       log.debug("Controller {} start reconciling {}..", this.name, request);
 
       // do reconciliation, invoke user customized logic.
-      Result result = this.reconciler.reconcile(request);
+      Result result = null;
+      try {
+        result = this.reconciler.reconcile(request);
+      } catch (Throwable t) {
+        log.error("Reconciler aborted unexpectedly", t);
+        result = new Result(true);
+      }
 
       try {
         // checks whether do a re-queue (on failure)

extended/src/test/java/io/kubernetes/client/extended/controller/DefaultControllerTest.java

@@ -103,7 +103,7 @@ public void testControllerWontStartBeforeReady() throws InterruptedException {
   }
 
   @Test
-  public void testControllerStopsWorkingWhenReconcilerAbortsWithRuntimeException()
+  public void testControllerKeepsWorkingWhenReconcilerAbortsWithRuntimeException()
       throws InterruptedException {
     AtomicBoolean aborts = new AtomicBoolean(true);
     AtomicBoolean resumed = new AtomicBoolean(false);
@@ -135,9 +135,10 @@ public Result reconcile(Request request) {
     // emit another event, the previous one has been backoff'd
     Request request2 = new Request("test2");
     workQueue.add(request2);
+    cooldown();
     testController.shutdown();
 
-    assertFalse(resumed.get());
-    assertEquals(0, finishedRequests.size());
+    assertTrue(resumed.get());
+    assertTrue(finishedRequests.size() >= 1);
   }
 }