fix: respect the duration in the current record

closes: #7160

Signed-off-by: Steve Hawkins <[email protected]>

Author: shawkins

CHANGELOG.md

@@ -5,6 +5,7 @@
 #### Bugs
 * Fix #7356: ensure request config is preserved when adapting to OpenShiftClient
 * Fix #7343: Leader election callbacks to be called only once (instead of 2)
+* Fix #7160: Use the duration from current leader record, not from the config
 * Fix #7347: Ensure vert.x websockets handle multiple frames
 
 #### Improvements

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/LeaderElector.java

@@ -275,7 +275,7 @@ protected final boolean isLeader(LeaderElectionRecord leaderElectionRecord) {
 
   protected final boolean canBecomeLeader(LeaderElectionRecord leaderElectionRecord) {
     return Utils.isNullOrEmpty(leaderElectionRecord.getHolderIdentity())
-        || now().isAfter(leaderElectionRecord.getRenewTime().plus(leaderElectionConfig.getLeaseDuration()));
+        || now().isAfter(leaderElectionRecord.getRenewTime().plus(leaderElectionRecord.getLeaseDuration()));
   }
 
   /**

kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/LeaderElectorTest.java

@@ -279,8 +279,8 @@ void canBecomeLeaderAndDifferentLeaderWithExpiredLockShouldReturnTrue() {
   void canBecomeLeaderAndDifferentLeaderWithActiveLockShouldReturnFalse() {
     // Given
     final LeaderElectionConfig lec = mock(LeaderElectionConfig.class);
-    when(lec.getLeaseDuration()).thenReturn(Duration.ofHours(1L));
     final LeaderElectionRecord ler = mock(LeaderElectionRecord.class);
+    when(ler.getLeaseDuration()).thenReturn(Duration.ofHours(1L));
     when(ler.getHolderIdentity()).thenReturn("someone");
     when(ler.getRenewTime()).thenReturn(ZonedDateTime.now(ZoneOffset.UTC));
     // When
@@ -289,6 +289,21 @@ void canBecomeLeaderAndDifferentLeaderWithActiveLockShouldReturnFalse() {
     assertFalse(result);
   }
 
+  @Test
+  void canBecomeLeaderRecordDurationDiffersFromConfig() {
+    // Given
+    final LeaderElectionConfig lec = mock(LeaderElectionConfig.class);
+    when(lec.getLeaseDuration()).thenReturn(Duration.ofHours(1L));
+    final LeaderElectionRecord ler = mock(LeaderElectionRecord.class);
+    when(ler.getLeaseDuration()).thenReturn(Duration.ofMinutes(15L));
+    when(ler.getHolderIdentity()).thenReturn("someone");
+    when(ler.getRenewTime()).thenReturn(ZonedDateTime.now(ZoneOffset.UTC).minus(Duration.ofMinutes(20L)));
+    // When
+    final boolean result = new LeaderElector(mock(NamespacedKubernetesClient.class), lec, Runnable::run).canBecomeLeader(ler);
+    // Then - because the duration from the record is used
+    assertTrue(result);
+  }
+
   @Test
   void loopCompletesOk() throws Exception {
     // Given