You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dr...@apache.org on 2016/06/07 23:45:13 UTC
[2/2] lucene-solr:SOLR-9191: SOLR-9191: Fix for DeleteStatusTest part
2; remove things from queue immediately on completion.
SOLR-9191: Fix for DeleteStatusTest part 2; remove things from queue immediately on completion.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8465ed21
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8465ed21
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8465ed21
Branch: refs/heads/SOLR-9191
Commit: 8465ed2119dd0634b2acf72f3dedca5914bac845
Parents: caba9d5
Author: Scott Blum <dr...@apache.org>
Authored: Tue Jun 7 19:20:12 2016 -0400
Committer: Scott Blum <dr...@apache.org>
Committed: Tue Jun 7 19:44:13 2016 -0400
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/OverseerTaskQueue.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8465ed21/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
index ee9cf05..aae7df2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java
@@ -82,9 +82,8 @@ public class OverseerTaskQueue extends DistributedQueue {
/**
* Remove the event and save the response into the other path.
- *
*/
- public byte[] remove(QueueEvent event) throws KeeperException,
+ public void remove(QueueEvent event) throws KeeperException,
InterruptedException {
TimerContext time = stats.time(dir + "_remove_event");
try {
@@ -97,9 +96,10 @@ public class OverseerTaskQueue extends DistributedQueue {
LOG.info("Response ZK path: " + responsePath + " doesn't exist."
+ " Requestor may have disconnected from ZooKeeper");
}
- byte[] data = zookeeper.getData(path, null, null, true);
- zookeeper.delete(path, -1, true);
- return data;
+ try {
+ zookeeper.delete(path, -1, true);
+ } catch (KeeperException.NoNodeException ignored) {
+ }
} finally {
time.stop();
}