Merge pull request #2261 from yue9944882/flake/leader-election-controller

Fixes leader election test failure: window threading behavior compatibility

Author: k8s-ci-robot

extended/src/main/java/io/kubernetes/client/extended/leaderelection/LeaderElector.java

@@ -137,10 +137,11 @@ public void run(
       // Hook on start leading
       hookWorkers.submit(startLeadingHook);
       renewLoop();
-      log.info("Failed to renew lease, lose leadership");
-      // Hook on stop leading
-      stopLeadingHook.run();
     } catch (Throwable t) {
+      log.error("Leader elector stopped due to an exception", t);
+    } finally {
+      // Hook on stop leading
+      log.info("Failed to renew lease, lose leadership");
       stopLeadingHook.run();
     }
   }

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

@@ -46,8 +46,8 @@ public void testLeaderElectingController() throws ApiException, InterruptedExcep
     AtomicReference<LeaderElectionRecord> record = new AtomicReference<>();
     record.set(new LeaderElectionRecord());
 
-    Semaphore latch = new Semaphore(2);
-    Semaphore controllerLatch = new Semaphore(2);
+    Semaphore apiClientSem = new Semaphore(0);
+    Semaphore controllerSem = new Semaphore(0);
 
     when(mockLock.identity()).thenReturn("foo");
     when(mockLock.get())
@@ -58,31 +58,31 @@ public void testLeaderElectingController() throws ApiException, InterruptedExcep
     doAnswer(
             invocationOnMock -> {
               record.set(invocationOnMock.getArgument(0));
-              latch.release();
+              apiClientSem.release();
               return true;
             })
         .when(mockLock)
         .create(any());
 
     doAnswer(
             invocationOnMock -> {
-              latch.release();
+              apiClientSem.release();
               return false;
             })
         .when(mockLock)
         .update(any());
 
     doAnswer(
             invocationOnMock -> {
-              controllerLatch.release();
+              controllerSem.release();
               return null;
             })
         .when(mockController)
         .run();
 
     doAnswer(
             invocationOnMock -> {
-              controllerLatch.release();
+              controllerSem.release();
               return null;
             })
         .when(mockController)
@@ -98,18 +98,15 @@ public void testLeaderElectingController() throws ApiException, InterruptedExcep
                     Duration.ofMillis(100))),
             mockController);
 
-    latch.acquire(2);
-    controllerLatch.acquire(2);
-
     Thread controllerThread = new Thread(leaderElectingController::run);
     controllerThread.start();
-    latch.acquire(2);
+    apiClientSem.acquire(2);
     controllerThread.interrupt();
 
     verify(mockLock, times(1)).create(any());
     verify(mockLock, atLeastOnce()).update(any());
 
-    controllerLatch.acquire(2);
+    controllerSem.acquire(2);
     verify(mockController, times(1)).run();
     verify(mockController, times(1)).shutdown();
   }