You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/09/30 08:08:25 UTC
[1/2] lucene-solr:master: SOLR-9556: Exit failover thread on interrupt
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 1c614e1d4 -> 1f0d75b80
refs/heads/master 64b0c91df -> ef747c844
SOLR-9556: Exit failover thread on interrupt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ef747c84
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ef747c84
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ef747c84
Branch: refs/heads/master
Commit: ef747c8445a5e3d698f7f02777c528883351f293
Parents: 64b0c91
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Sep 30 09:05:01 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Sep 30 09:05:43 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef747c84/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 45a8c8b..1e347de 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -141,6 +141,9 @@ Bug Fixes
* SOLR-9554: Fix NullPointerException when cores are loaded in parallel and switch schema.xml to managed-scheme.
(Alan Woodward, Mikhail Khludnev)
+* SOLR-9556: OverseerAutoFailoverReplicaThread was not exiting on interrupt
+ (Alan Woodward)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef747c84/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
index 99f0192..83679a5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
@@ -137,6 +137,7 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
Thread.sleep(workLoopDelay);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
+ return;
}
}
}
[2/2] lucene-solr:branch_6x: SOLR-9556: Exit failover thread on
interrupt
Posted by ro...@apache.org.
SOLR-9556: Exit failover thread on interrupt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1f0d75b8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1f0d75b8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1f0d75b8
Branch: refs/heads/branch_6x
Commit: 1f0d75b802f2968703692fe4b8c82b70ba851cea
Parents: 1c614e1
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Sep 30 09:05:01 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Sep 30 09:06:10 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1f0d75b8/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 98ee88c..c06856c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -110,6 +110,9 @@ Bug Fixes
* SOLR-9554: Fix NullPointerException when cores are loaded in parallel and switch schema.xml to managed-scheme.
(Alan Woodward, Mikhail Khludnev)
+* SOLR-9556: OverseerAutoFailoverReplicaThread was not exiting on interrupt
+ (Alan Woodward)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1f0d75b8/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
index 99f0192..83679a5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
@@ -137,6 +137,7 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
Thread.sleep(workLoopDelay);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
+ return;
}
}
}