wip

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionInitiator.java

@@ -135,7 +135,7 @@ void postConstruct() {
 	@PreDestroy
 	void preDestroy() {
 		destroyCalled = true;
-		LOG.info(() -> "preDestroy called in the leader initiator : " + candidateIdentity);
+		LOG.info(() -> "preDestroy called on the leader initiator : " + candidateIdentity);
 
 		if (podReadyFuture != null && !podReadyFuture.isDone()) {
 			// if the task is not running, this has no effect.
@@ -145,7 +145,7 @@ void preDestroy() {
 		}
 
 		if (leaderFuture != null) {
-			LOG.info(() -> "leader will be canceled : " + candidateIdentity);
+			LOG.info(() -> "leaderFuture will be canceled for : " + candidateIdentity);
 			// needed to release the lock, in case we are holding it.
 			// fabric8 internally expects this one to be called
 			leaderFuture.cancel(true);

spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/it/Fabric8LeaderElectionSimpleITTest.java

@@ -29,6 +29,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.springframework.cloud.kubernetes.commons.leader.LeaderUtils;
+import org.springframework.cloud.kubernetes.commons.leader.election.LeaderElectionProperties;
 import org.testcontainers.k3s.K3sContainer;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +81,7 @@ void test(CapturedOutput output) {
 
 		// we have become the leader
 		Awaitility.await()
-			.atMost(Duration.ofSeconds(10))
+			.atMost(Duration.ofSeconds(60))
 			.pollInterval(Duration.ofSeconds(1))
 			.until(() -> output.getOut().contains("simple-it is the new leader"));
 
@@ -101,12 +102,16 @@ void test(CapturedOutput output) {
 		// 4. we are the leader (comes from our code)
 		assertThat(output.getOut()).contains("Leader changed from null to simple-it");
 
+		// 5. wait until a renewal happens (comes from fabric code)
+		//    this one means that we have extended our leadership
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(15))
+			.pollInterval(Duration.ofSeconds(1))
+			.until(() -> output.getOut().contains(
+				"Attempting to renew leader lease 'LeaseLock: default - spring-k8s-leader-election-lock (simple-it)'"));
+
 
 
-//		// all these logs happen before a renewal
-//		Assertions.assertThat(output.getOut()).contains("starting leader initiator");
-//		Assertions.assertThat(output.getOut()).contains("Leader election started");
-//		Assertions.assertThat(output.getOut()).contains("Successfully Acquired leader lease");
 //
 //		Lease lockLease = kubernetesClient.leases()
 //			.inNamespace("default")