Skip to content

fix: leader election stop deadlock #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 24, 2022
Merged

fix: leader election stop deadlock #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0b043c
fix: leader election stop deadlock
csviri Nov 22, 2022
c68282a
cleanup
csviri Nov 22, 2022
785422b
fix: leader election stop deadlock
csviri Nov 22, 2022
c0d3e15
format
csviri Nov 22, 2022
cf196f5
fix issue
csviri Nov 23, 2022
6639cdd
format
csviri Nov 23, 2022
25ba08c
imports
csviri Nov 23, 2022
22e6f2d
format
csviri Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ public Operator(KubernetesClient kubernetesClient, ConfigurationService configur

/** Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down. */
public void installShutdownHook() {
Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
if (!leaderElectionManager.isLeaderElectionEnabled()) {
Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
} else {
log.warn("Leader election is on, shutdown hook will not be installed.");
}
}

public KubernetesClient getKubernetesClient() {
Expand Down Expand Up @@ -112,7 +116,6 @@ public void stop() throws OperatorException {
final var configurationService = ConfigurationServiceProvider.instance();
log.info(
"Operator SDK {} is shutting down...", configurationService.getVersion().getSdkVersion());

controllerManager.stop();
ExecutorServiceManager.stop();
leaderElectionManager.stop();
Expand Down
3 changes: 2 additions & 1 deletion ...e-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import org.takes.http.Exit;
import org.takes.http.FtBasic;

import io.fabric8.kubernetes.client.*;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
import io.javaoperatorsdk.operator.Operator;

public class WebPageOperator {
Expand Down