From 055c4d2a571472e83e937228938470f5a407e74c Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Wed, 3 May 2017 11:58:08 +0530
Subject: [PATCH] SOLR-10376: Close actions on trigger close

---
 .../org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java     | 2 ++
 .../java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
index e4a61006bab..4654cfb6410 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.lucene.util.IOUtils;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.core.CoreContainer;
 import org.slf4j.Logger;
@@ -138,6 +139,7 @@ public class NodeAddedTrigger implements AutoScaling.Trigger<NodeAddedTrigger.No
   public void close() throws IOException {
     synchronized (this) {
       isClosed = true;
+      IOUtils.closeWhileHandlingException(actions);
     }
   }
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
index 843e710a8c7..1f510c2e14a 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
@@ -31,6 +31,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.lucene.util.IOUtils;
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.core.CoreContainer;
 import org.apache.zookeeper.KeeperException;
@@ -141,6 +142,7 @@ public class NodeLostTrigger implements AutoScaling.Trigger<NodeLostTrigger.Node
   public void close() throws IOException {
     synchronized (this) {
       isClosed = true;
+      IOUtils.closeWhileHandlingException(actions);
     }
   }