Merge pull request #2267 from yue9944882/fix/flakiness-leader-election-controller-test

Flakiness: testLeaderElectingController interrupt leader-elector too soon

Author: k8s-ci-robot

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

@@ -47,7 +47,8 @@ public void testLeaderElectingController() throws ApiException, InterruptedExcep
     record.set(new LeaderElectionRecord());
 
     Semaphore apiClientSem = new Semaphore(0);
-    Semaphore controllerSem = new Semaphore(0);
+    Semaphore controllerStartSem = new Semaphore(0);
+    Semaphore controllerStopSem = new Semaphore(0);
 
     when(mockLock.identity()).thenReturn("foo");
     when(mockLock.get())
@@ -74,15 +75,15 @@ public void testLeaderElectingController() throws ApiException, InterruptedExcep
 
     doAnswer(
             invocationOnMock -> {
-              controllerSem.release();
+              controllerStartSem.release();
               return null;
             })
         .when(mockController)
         .run();
 
     doAnswer(
             invocationOnMock -> {
-              controllerSem.release();
+              controllerStopSem.release();
               return null;
             })
         .when(mockController)
@@ -101,12 +102,13 @@ public void testLeaderElectingController() throws ApiException, InterruptedExcep
     Thread controllerThread = new Thread(leaderElectingController::run);
     controllerThread.start();
     apiClientSem.acquire(2);
+    controllerStartSem.acquire(1);
     controllerThread.interrupt();
 
     verify(mockLock, times(1)).create(any());
     verify(mockLock, atLeastOnce()).update(any());
 
-    controllerSem.acquire(2);
+    controllerStopSem.acquire(1);
     verify(mockController, times(1)).run();
     verify(mockController, times(1)).shutdown();
   }