You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/05/03 06:28:17 UTC
lucene-solr:feature/autoscaling: SOLR-10376: Close actions on trigger
close
Repository: lucene-solr
Updated Branches:
refs/heads/feature/autoscaling c1bdd8de6 -> 055c4d2a5
SOLR-10376: Close actions on trigger close
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/055c4d2a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/055c4d2a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/055c4d2a
Branch: refs/heads/feature/autoscaling
Commit: 055c4d2a571472e83e937228938470f5a407e74c
Parents: c1bdd8d
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed May 3 11:58:08 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed May 3 11:58:08 2017 +0530
----------------------------------------------------------------------
.../java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java | 2 ++
.../java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/055c4d2a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java
----------------------------------------------------------------------
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 e4a6100..4654cfb 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);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/055c4d2a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java
----------------------------------------------------------------------
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 843e710..1f510c2 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);
}
}