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 2015/02/26 16:22:38 UTC
svn commit: r1662480 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Author: shalin
Date: Thu Feb 26 15:22:37 2015
New Revision: 1662480
URL: http://svn.apache.org/r1662480
Log:
SOLR-7011: Delete collection returns before collection is actually removed
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1662480&r1=1662479&r2=1662480&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Thu Feb 26 15:22:37 2015
@@ -70,6 +70,9 @@ Bug Fixes
* SOLR-6941: DistributedQueue#containsTaskWithRequestId can fail with NPE. (Mark Miller)
+* SOLR-7011: Delete collection returns before collection is actually removed.
+ (Christine Poerschke via shalin)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1662480&r1=1662479&r2=1662480&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Thu Feb 26 15:22:37 2015
@@ -981,7 +981,7 @@ public class OverseerCollectionProcessor
private void deleteCollection(ZkNodeProps message, NamedList results)
throws KeeperException, InterruptedException {
- String collection = message.getStr("name");
+ final String collection = message.getStr("name");
try {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CoreAdminParams.ACTION, CoreAdminAction.UNLOAD.toString());
@@ -1001,7 +1001,7 @@ public class OverseerCollectionProcessor
boolean removed = false;
while (System.nanoTime() < timeout) {
Thread.sleep(100);
- removed = !zkStateReader.getClusterState().hasCollection(message.getStr(collection));
+ removed = !zkStateReader.getClusterState().hasCollection(collection);
if (removed) {
Thread.sleep(300); // just a bit of time so it's more likely other
// readers see on return
@@ -1010,7 +1010,7 @@ public class OverseerCollectionProcessor
}
if (!removed) {
throw new SolrException(ErrorCode.SERVER_ERROR,
- "Could not fully remove collection: " + message.getStr("name"));
+ "Could not fully remove collection: " + collection);
}
} finally {