Skip to content

Fix Race in Closing IndicesService.CacheCleaner #42016

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
original-brownbear merged 1 commit into from
May 9, 2019
Merged

Fix Race in Closing IndicesService.CacheCleaner #42016

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
9 changes: 8 additions & 1 deletion server/src/main/java/org/elasticsearch/indices/IndicesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import org.elasticsearch.common.util.Maps;
import org.elasticsearch.common.util.concurrent.AbstractRefCounted;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.util.iterable.Iterables;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
Expand Down Expand Up @@ -1219,7 +1220,13 @@ public void run() {
}
// Reschedule itself to run again if not closed
if (closed.get() == false) {
threadPool.schedule(this, interval, ThreadPool.Names.SAME);
try {
threadPool.schedule(this, interval, ThreadPool.Names.SAME);
Copy link
Contributor

@ywelsch ywelsch May 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

easier to use scheduleUnlessShuttingDown?

Copy link
Contributor Author

@original-brownbear original-brownbear May 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry! Didn't know about that method, will open cleanup PR in a sec.

} catch (EsRejectedExecutionException e) {
if (closed.get() == false) {
throw e;
}
}
}
}

Expand Down