Cleanup IndicesService#CacheCleaner Scheduling (#42060) (#43528)

* Follow up to #42016
elastic · Jun 25, 2019 · 62a2892 · 62a2892
1 parent 3d5e457
commit 62a2892
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java
@@ -65,7 +65,6 @@
 import org.elasticsearch.common.util.BigArrays;
 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;
@@ -1226,13 +1225,7 @@ public void run() {
             }
             // Reschedule itself to run again if not closed
             if (closed.get() == false) {
-                try {
-                    threadPool.schedule(this, interval, ThreadPool.Names.SAME);
-                } catch (EsRejectedExecutionException e) {
-                    if (closed.get() == false) {
-                        throw e;
-                    }
-                }
+                threadPool.scheduleUnlessShuttingDown(interval, ThreadPool.Names.SAME, this);
             }
         }