review comments

Author: wind57

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/PodReady.java

@@ -17,7 +17,9 @@
 package org.springframework.cloud.kubernetes.commons;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BooleanSupplier;
 
 import org.springframework.core.log.LogAccessor;
@@ -29,14 +31,16 @@ public final class PodReady {
 
 	private static final LogAccessor LOG = new LogAccessor(PodReady.class);
 
+	private final AtomicReference<ScheduledFuture<?>> podReadyTask = new AtomicReference<>();
+
 	private final CachedSingleThreadScheduler podReadyScheduler = new CachedSingleThreadScheduler(
 			TimeUnit.SECONDS.toMillis(10));
 
 	public CompletableFuture<Void> podReady(BooleanSupplier isPodReady, String holderIdentity, String podNamespace) {
 
 		CompletableFuture<Void> podReadyFuture = new CompletableFuture<>();
 
-		podReadyScheduler.scheduleWithFixedDelay(() -> {
+		podReadyTask.set(podReadyScheduler.scheduleWithFixedDelay(() -> {
 
 			try {
 				LOG.info(() -> "waiting for pod : " + holderIdentity + " in namespace : " + podNamespace
@@ -56,10 +60,14 @@ public CompletableFuture<Void> podReady(BooleanSupplier isPodReady, String holde
 				podReadyFuture.completeExceptionally(e);
 			}
 
-		}, 1, 1, TimeUnit.SECONDS);
+		}, 1, 1, TimeUnit.SECONDS));
 
 		return podReadyFuture;
 
 	}
 
+	public AtomicReference<ScheduledFuture<?>> getPodReadyTask() {
+		return podReadyTask;
+	}
+
 }

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

@@ -20,7 +20,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -57,8 +56,6 @@ final class Fabric8LeaderElectionInitiator {
 
 	private final AtomicReference<ExecutorService> executorService = new AtomicReference<>();
 
-	private final AtomicReference<ScheduledFuture<?>> podReadyTask = new AtomicReference<>();
-
 	private final AtomicReference<CompletableFuture<?>> leaderFutureReference = new AtomicReference<>();
 
 	private volatile boolean destroyCalled = false;
@@ -115,7 +112,7 @@ void postConstruct() {
 					}
 					// we cancel the future that checks readiness of the pod
 					// and thus also close the pool that was running it.
-					podReadyTask.get().cancel(true);
+					podReady.getPodReadyTask().get().cancel(true);
 				});
 				try {
 					ready.get();
@@ -141,11 +138,11 @@ void postConstruct() {
 	void preDestroy() {
 		destroyCalled();
 		LOG.info(() -> "preDestroy called in the leader initiator : " + holderIdentity);
-		if (podReadyTask.get() != null) {
+		if (podReady.getPodReadyTask().get() != null) {
 			// if the task is not running, this has no effect
 			// if the task is running, calling this will also make sure
 			// that the caching executor will shut down too.
-			podReadyTask.get().cancel(true);
+			podReady.getPodReadyTask().get().cancel(true);
 		}
 
 		if (leaderFutureReference.get() != null) {