more changes

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

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/election/PodReadyRunner.java

@@ -52,7 +52,7 @@ public CompletableFuture<Void> podReady(BooleanSupplier podReadySupplier) {
 		ScheduledFuture<?> scheduledFuture = podReadySelfShutDownScheduler.scheduleWithFixedDelay(() -> {
 
 			if (podReadyCompletableFuture.isDone()) {
-				LOG.info(() -> "pod readiness is known, not running another cycle");
+				LOG.info(() -> "podReadyCompletableFuture is done");
 				return;
 			}
 
@@ -82,7 +82,16 @@ public CompletableFuture<Void> podReady(BooleanSupplier podReadySupplier) {
 	}
 
 	/**
-	 * call scheduledFuture::cancel, thus the podReadySelfShutDownScheduler will shutdown.
+	 * <pre>
+	 * This can be called from two sides:
+	 *  - when readiness ScheduledFuture is still running and CompletableFuture::cancel is called.
+	 *     1. in this case, the inner "whenComplete" is called, scheduledFuture is canceled and done
+	 *     2. podReadyCompletableFuture.isDone() from the above is hit, scheduledFuture is canceled and done
+	 *
+	 *  - when readiness ScheduledFuture is done already, CompletableFuture is completed also.
+	 *    in this case, we will call scheduledFuture.cancel(true) also, because the scheduledFuture
+	 *    still runs, although it will do nothing because we check against: podReadyCompletableFuture.isDone()
+	 * </pre>
 	 */
 	private void attachShutDownHook(CompletableFuture<Void> podReadyCompletableFuture,
 			ScheduledFuture<?> scheduledFuture) {
@@ -105,7 +114,8 @@ private void attachShutDownHook(CompletableFuture<Void> podReadyCompletableFutur
 
 			// no matter the outcome, we cancel the future and thus shut down the
 			// executor that runs it.
-			scheduledFuture.cancel(true);
+			boolean canceled = scheduledFuture.cancel(true);
+			LOG.info(() -> "scheduledFuture is canceled: " + canceled);
 		});
 	}
 

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/leader/election/PodReadyRunnerTests.java

@@ -222,12 +222,13 @@ void readinessCanceledOnTheSecondCycleAttachNewPipeline(CapturedOutput output) t
 			assertThat(output.getOut()).doesNotContain("leader election for : identity was not successful");
 			assertThat(output.getOut()).contains("readiness failed and we caught that");
 
-			await().atMost(Duration.ofSeconds(3))
+			await().atMost(Duration.ofSeconds(3000))
 				.pollInterval(Duration.ofMillis(200))
 				.until(() -> output.getOut().contains("Shutting down executor : podReadyExecutor"));
 
 			assertThat(output.getOut()).contains("canceling scheduled future because completable future was cancelled");
 			assertThat(output.getOut()).doesNotContain("canceling scheduled future because readiness failed");
+			assertThat(output.getOut()).contains("scheduledFuture is canceled: true");
 
 
 		}