fix tests

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

@@ -61,8 +61,6 @@ final class Fabric8LeaderElectionInitiator {
 
 	private volatile CompletableFuture<Void> podReadyFuture;
 
-	private volatile boolean destroyCalled = false;
-
 	private volatile CompletableFuture<?> leaderFuture;
 
 	Fabric8LeaderElectionInitiator(String candidateIdentity, String candidateNamespace,
@@ -119,7 +117,6 @@ void postConstruct() {
 
 	@PreDestroy
 	void preDestroy() {
-		destroyCalled = true;
 		LOG.info(() -> "preDestroy called on the leader initiator : " + candidateIdentity);
 
 		if (!podReadyWaitingExecutor.isShutdown()) {
@@ -136,7 +133,6 @@ void preDestroy() {
 		}
 
 		if (leaderFuture != null) {
-			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
 			LOG.debug(() -> "leaderFuture will be canceled for : " + candidateIdentity);
@@ -156,13 +152,12 @@ private void startLeaderElection() {
 		leaderFuture.whenComplete((ok, error) -> {
 
 			if (error != null) {
+				// only we have a reference to leaderFuture; and if it is canceled, it is
+				// only possible
+				// from our own preDestroy
 				if (error instanceof CancellationException) {
-					if (!destroyCalled) {
-						LOG.warn(() -> "renewal failed for  : " + candidateIdentity + ", will re-start it after : "
-								+ leaderElectionProperties.waitAfterRenewalFailure().toSeconds() + " seconds");
-						sleep(leaderElectionProperties);
-						podReadyWaitingExecutor.execute(this::startLeaderElection);
-					}
+					LOG.info(() -> "cancel was called on the leader initiator : " + candidateIdentity);
+					LOG.info(() -> "terminating leadership for : " + candidateIdentity);
 				}
 				else {
 					LOG.warn(() -> "leader failed with : " + error.getMessage());

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

@@ -38,6 +38,7 @@
 import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import org.springframework.test.annotation.DirtiesContext;
 
 /**
  * @author wind57
@@ -50,6 +51,7 @@
 				"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 })
+@DirtiesContext
 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/Fabric8LeaderElectionCanceledAndNotRestartedIT.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.kubernetes.fabric8.leader.election;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.springframework.cloud.kubernetes.fabric8.leader.election.Assertions.assertAcquireAndRenew;
+import static org.springframework.cloud.kubernetes.integration.tests.commons.Awaitilities.awaitUntil;
+
+/**
+ * <pre>
+ *     - we acquire the leadership
+ *     - leadership feature fails
+ * </pre>
+ *
+ * @author wind57
+ */
+@TestPropertySource(properties = { "spring.cloud.kubernetes.leader.election.wait-for-pod-ready=true",
+		"spring.cloud.kubernetes.leader.election.restart-on-failure=true", "readiness.passes=true" })
+class Fabric8LeaderElectionCanceledAndNotRestartedIT extends AbstractLeaderElection {
+
+	private static final String NAME = "acquired-then-canceled";
+
+	@Autowired
+	private Fabric8LeaderElectionInitiator initiator;
+
+	@BeforeAll
+	static void beforeAll() {
+		AbstractLeaderElection.beforeAll(NAME);
+	}
+
+	@AfterEach
+	void afterEach() {
+		stopFutureAndDeleteLease(initiator);
+	}
+
+	@Test
+	void test(CapturedOutput output) {
+
+		assertAcquireAndRenew(output, this::getLease, NAME);
+
+		initiator.leaderFeature().cancel(true);
+
+		awaitUntil(10, 100, () -> output.getOut().contains("cancel was called on the leader initiator : " + NAME));
+
+		// lease is going to reset
+		awaitUntil(10, 100, () -> getLease().getSpec().getHolderIdentity().isEmpty());
+
+	}
+
+}