Skip to content

Commit c0b043c

Browse files
committed
fix: leader election stop deadlock
1 parent 532b480 commit c0b043c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,10 @@ public void stop() throws OperatorException {
112112
final var configurationService = ConfigurationServiceProvider.instance();
113113
log.info(
114114
"Operator SDK {} is shutting down...", configurationService.getVersion().getSdkVersion());
115-
116-
controllerManager.stop();
117-
ExecutorServiceManager.stop();
118-
leaderElectionManager.stop();
119-
if (configurationService.closeClientOnStop()) {
120-
kubernetesClient.close();
115+
controllerManager.stop();
116+
ExecutorServiceManager.stop();
117+
if (configurationService.closeClientOnStop()) {
118+
kubernetesClient.close();
121119
}
122120
}
123121

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public void stop() {
110110
try {
111111
log.debug("Stopping informer for namespace: {} -> {}", ns, source);
112112
source.stop();
113+
log.debug("Informer stopped: {} -> {}", ns, source);
113114
} catch (Exception e) {
114115
log.warn("Error stopping informer for namespace: {} -> {}", ns, source, e);
115116
}

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import io.fabric8.kubernetes.client.*;
1313
import io.javaoperatorsdk.operator.Operator;
14+
import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
1415

1516
public class WebPageOperator {
1617
public static final String WEBPAGE_RECONCILER_ENV = "WEBPAGE_RECONCILER";

0 commit comments

Comments
 (0)