Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10376: Close actions on trigger close

This commit is contained in:
Shalin Shekhar Mangar 2017-05-03 11:58:08 +05:30
parent c1bdd8de6e
commit 055c4d2a57
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
View File

@ -31,6 +31,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer; import org.apache.solr.core.CoreContainer;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -138,6 +139,7 @@ public class NodeAddedTrigger implements AutoScaling.Trigger<NodeAddedTrigger.No
public void close() throws IOException { public void close() throws IOException {
synchronized (this) { synchronized (this) {
isClosed = true; isClosed = true;
IOUtils.closeWhileHandlingException(actions);
} }
} }

2
solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
View File

@ -31,6 +31,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer; import org.apache.solr.core.CoreContainer;
import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException;
@ -141,6 +142,7 @@ public class NodeLostTrigger implements AutoScaling.Trigger<NodeLostTrigger.Node
public void close() throws IOException { public void close() throws IOException {
synchronized (this) { synchronized (this) {
isClosed = true; isClosed = true;
IOUtils.closeWhileHandlingException(actions);
} }
} }