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

@@ -109,8 +109,8 @@ void postConstruct() {
 				// 'blockReadinessCheck'
 				CompletableFuture<?> ready = podReadyFuture.whenComplete((ok, error) -> {
 					if (error != null) {
-						LOG.error(() -> "readiness failed for : " + candidateIdentity +
-							", leader election will not start");
+						LOG.error(() -> "readiness failed for : " + candidateIdentity
+								+ ", leader election will not start");
 					}
 					else {
 						LOG.info(() -> candidateIdentity + " is ready");

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/AbstractLeaderElection.java

@@ -27,13 +27,13 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.testcontainers.k3s.K3sContainer;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.kubernetes.commons.leader.LeaderUtils;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
 import org.springframework.context.annotation.Bean;
@@ -44,10 +44,10 @@
  */
 @ExtendWith(OutputCaptureExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-	properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.leader.election.enabled=true",
-	"logging.level.org.springframework.cloud.kubernetes.commons.leader.election=debug",
-	"logging.level.org.springframework.cloud.kubernetes.fabric8.leader.election=debug" },
-	classes = { App.class, AbstractLeaderElection.LocalConfiguration.class })
+		properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.leader.election.enabled=true",
+				"logging.level.org.springframework.cloud.kubernetes.commons.leader.election=debug",
+				"logging.level.org.springframework.cloud.kubernetes.fabric8.leader.election=debug" },
+		classes = { App.class, AbstractLeaderElection.LocalConfiguration.class })
 abstract class AbstractLeaderElection {
 
 	private static K3sContainer container;

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessCanceledIT.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.kubernetes.fabric8.leader.election;
 
+import java.time.Duration;
+
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -24,19 +26,15 @@
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.test.context.TestPropertySource;
 
-import java.time.Duration;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Readiness is canceled. This is the case when pod is shut down gracefully
  *
  * @author wind57
  */
-@TestPropertySource(properties = {
-	"readiness.cycle.false=true",
-	"spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true"
-})
+@TestPropertySource(properties = { "readiness.cycle.false=true",
+		"spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true" })
 class Fabric8LeaderElectionReadinessCanceledIT extends AbstractLeaderElection {
 
 	@Autowired
@@ -54,36 +52,39 @@ void test(CapturedOutput output) {
 		Awaitility.await()
 			.atMost(Duration.ofSeconds(60))
 			.pollInterval(Duration.ofSeconds(1))
-			.until(() -> output.getOut().contains(
-				"Pod : canceled-readiness-it in namespace : default is not ready, will retry in one second"
-			));
+			.until(() -> output.getOut()
+				.contains("Pod : canceled-readiness-it in namespace : default is not ready, will retry in one second"));
 
 		initiator.preDestroy();
 
 		try {
 			Thread.sleep(2_000);
-		} catch (InterruptedException e) {
+		}
+		catch (InterruptedException e) {
 			throw new RuntimeException(e);
 		}
 
-		// 1. preDestroy logs what it will do
+		// 1. preDestroy method logs what it will do
 		assertThat(output.getOut()).contains("podReadyFuture will be canceled for : canceled-readiness-it");
 
 		// 2. readiness failed
-		assertThat(output.getOut()).contains(
-			"readiness failed for : canceled-readiness-it, leader election will not start");
+		assertThat(output.getOut())
+			.contains("readiness failed for : canceled-readiness-it, leader election will not start");
 
 		// 3. will cancel the future that is supposed to do the readiness
-		assertThat(output.getOut()).contains(
-			"canceling scheduled future because completable future was cancelled");
+		assertThat(output.getOut()).contains("canceling scheduled future because completable future was cancelled");
 
 		// 4. podReadyWaitingExecutor is shut down also
-		assertThat(output.getOut()).contains(
-			"podReadyWaitingExecutor will be shutdown for : canceled-readiness-it");
+		assertThat(output.getOut()).contains("podReadyWaitingExecutor will be shutdown for : canceled-readiness-it");
 
 		// 5. the scheduled executor where pod readiness is checked is shut down also
-		assertThat(output.getOut()).contains(
-			"Shutting down executor : podReadyExecutor");
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(2))
+			.pollInterval(Duration.ofMillis(100))
+			.until(() -> output.getOut().contains("Shutting down executor : podReadyExecutor"));
+
+		// 6. leader election is not started, since readiness does not finish
+		assertThat(output.getOut()).doesNotContain("leaderFuture will be canceled for");
 
 	}
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessFailsIT.java

@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,28 +32,27 @@
  *
  * @author wind57
  */
-@TestPropertySource(properties = {"readiness.fails=true",
-	"spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true"
-})
+@TestPropertySource(
+		properties = { "readiness.fails=true", "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true" })
 class Fabric8LeaderElectionReadinessFailsIT extends AbstractLeaderElection {
 
 	@BeforeAll
 	static void beforeAll() {
 		AbstractLeaderElection.beforeAll("readiness-fails-simple-it");
 	}
 
-	/* <pre>
-	 *     - readiness fails after 2 seconds
-	 *     - leader election process is not started at all
-	 * </pre>
+	/*
+	 * <pre> - readiness fails after 2 seconds - leader election process is not started at
+	 * all </pre>
 	 */
 	@Test
 	void test(CapturedOutput output) {
 		// we do not start leader election at all
 		Awaitility.await()
 			.atMost(Duration.ofSeconds(60))
 			.pollInterval(Duration.ofSeconds(1))
-			.until(() -> output.getOut().contains("leader election for : readiness-fails-simple-it will not start"));
+			.until(() -> output.getOut()
+				.contains("readiness failed for : readiness-fails-simple-it, leader election will not start"));
 
 		// let's unwind some logs to see that the process is how we expect it to be
 
@@ -77,18 +76,22 @@ void test(CapturedOutput output) {
 		assertThat(output.getOut()).contains("exception waiting for pod : readiness-fails-simple-it");
 
 		// 7. readiness failed
-		assertThat(output.getOut()).contains(
-			"pod readiness for : readiness-fails-simple-it failed with : readiness fails");
+		assertThat(output.getOut())
+			.contains("pod readiness for : readiness-fails-simple-it failed with : readiness fails");
 
 		// 8. we shut down the executor
 		assertThat(output.getOut()).contains("canceling scheduled future because readiness failed");
 
 		// 9. leader election did not even start properly
-		assertThat(output.getOut()).contains(
-			"pod readiness for : readiness-fails-simple-it failed with : readiness fails");
+		assertThat(output.getOut())
+			.contains("pod readiness for : readiness-fails-simple-it failed with : readiness fails");
 
 		// 10. executor is shutdown, even when readiness failed
-		assertThat(output.getOut()).contains("Shutting down executor : podReadyExecutor");
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(2))
+			.pollInterval(Duration.ofMillis(100))
+			.until(() -> output.getOut().contains("Shutting down executor : podReadyExecutor"));
+
 	}
 
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-leader-election/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/election/Fabric8LeaderElectionReadinessPassesIT.java

@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,9 +32,9 @@
  *
  * @author wind57
  */
-@TestPropertySource(properties = { "readiness.passes=true",
-	"spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true" })
-class Fabric8LeaderElectionReadinessPassesIT extends AbstractLeaderElection  {
+@TestPropertySource(
+		properties = { "readiness.passes=true", "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true" })
+class Fabric8LeaderElectionReadinessPassesIT extends AbstractLeaderElection {
 
 	@BeforeAll
 	static void beforeAll() {
@@ -80,7 +80,10 @@ void test(CapturedOutput output) {
 		assertThat(output.getOut()).contains("canceling scheduled future because readiness succeeded");
 
 		// 8. executor is shutdown
-		assertThat(output.getOut()).contains("Shutting down executor : podReadyExecutor");
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(2))
+			.pollInterval(Duration.ofMillis(100))
+			.until(() -> output.getOut().contains("Shutting down executor : podReadyExecutor"));
 
 		// 9. pod is now ready
 		assertThat(output.getOut()).contains("readiness-passes-simple-it is ready");