Unregister

Author: albertzaharovits

server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutor.java

@@ -75,6 +75,12 @@ public synchronized void registerMergeScheduler(ThreadPoolMergeScheduler threadP
         }
     }
 
+    public synchronized void unregisterMergeScheduler(ThreadPoolMergeScheduler threadPoolMergeScheduler) {
+        if (registeredMergeSchedulers.remove(threadPoolMergeScheduler) == false) {
+            throw new IllegalStateException("cannot unregister if the scheduler has not been registered");
+        }
+    }
+
     public synchronized void updateMergeScheduler(
         ThreadPoolMergeScheduler threadPoolMergeScheduler,
         Consumer<ThreadPoolMergeScheduler> updater

server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeScheduler.java

@@ -438,6 +438,13 @@ protected void message(String message) {
         super.message(message);
     }
 
+    /** Close this MergeScheduler. */
+    @Override
+    public void close() throws IOException {
+        super.close();
+        threadPoolMergeExecutor.unregisterMergeScheduler(this);
+    }
+
     private static double nsToSec(long ns) {
         return ns / (double) TimeUnit.SECONDS.toNanos(1);
     }