Skip to content

Clean-up all file watcher keys in FileSettingsService #89429

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 1 commit into from
Aug 17, 2022
Merged

Clean-up all file watcher keys in FileSettingsService #89429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class FileSettingsService extends AbstractLifecycleComponent implements C

private volatile FileUpdateState fileUpdateState = null;
private volatile WatchKey settingsDirWatchKey = null;
private volatile WatchKey configDirWatchKey = null;

private volatile boolean active = false;
private volatile boolean initialState = true;
Expand Down Expand Up @@ -206,6 +207,17 @@ boolean watching() {
return this.watchService != null;
}

private void cleanupWatchKeys() {
if (settingsDirWatchKey != null) {
settingsDirWatchKey.cancel();
settingsDirWatchKey = null;
}
if (configDirWatchKey != null) {
configDirWatchKey.cancel();
configDirWatchKey = null;
}
}

synchronized void startWatcher(ClusterState clusterState, boolean onStartup) {
if (watching() || active == false) {
refreshExistingFileStateIfNeeded(clusterState);
Expand Down Expand Up @@ -245,10 +257,11 @@ synchronized void startWatcher(ClusterState clusterState, boolean onStartup) {
// We watch the config directory always, even if initially we had an operator directory
// it can be deleted and created later. The config directory never goes away, we only
// register it once for watching.
enableSettingsWatcher(null, operatorSettingsDir().getParent());
configDirWatchKey = enableSettingsWatcher(configDirWatchKey, operatorSettingsDir().getParent());
} catch (Exception e) {
if (watchService != null) {
try {
cleanupWatchKeys();
this.watchService.close();
} catch (Exception ignore) {} finally {
this.watchService = null;
Expand Down Expand Up @@ -322,10 +335,7 @@ synchronized void stopWatcher() {
logger.debug("stopping watcher ...");
if (watching()) {
try {
if (settingsDirWatchKey != null) {
settingsDirWatchKey.cancel();
settingsDirWatchKey = null;
}
cleanupWatchKeys();
fileUpdateState = null;
watchService.close();
if (watcherThreadLatch != null) {
Expand Down