You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/10/22 09:28:18 UTC
lucene-solr:master: SOLR-12729: Unlock the shard on error.
Repository: lucene-solr
Updated Branches:
refs/heads/master 5de633220 -> 8c70811f3
SOLR-12729: Unlock the shard on error.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8c70811f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8c70811f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8c70811f
Branch: refs/heads/master
Commit: 8c70811f3a2a4deab8186b187909ac5c3615e6fb
Parents: 5de6332
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Oct 22 11:27:35 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Oct 22 11:28:09 2018 +0200
----------------------------------------------------------------------
.../apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c70811f/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
index 43e12ce..a7471eb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
@@ -1156,6 +1156,7 @@ public class SimClusterStateProvider implements ClusterStateProvider {
Map<String, Object> props = sliceProperties.computeIfAbsent(collectionName, c -> new ConcurrentHashMap<>())
.computeIfAbsent(sliceName.get(), ss -> new ConcurrentHashMap<>());
if (props.containsKey(BUFFERED_UPDATES)) {
+ SplitShardCmd.unlockForSplit(cloudManager, collectionName, sliceName.get());
throw new Exception("--- SOLR-12729: Overlapping splitShard commands for " + collectionName + "/" + sliceName.get());
}
props.put(BUFFERED_UPDATES, new AtomicLong());