Apache Solr open-source search software
SOLR-16473: Fix race condition in shard split when a sub-shard is put in recovery state.
Bruno Roustant4519c1fcb050
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex e9859787965..e86ec35c31e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -116,6 +116,7 @@ Bug Fixes* SOLR-16165: Rare Deadlock in SlotAcc initialization (Justin Sweeney, noble)+* SOLR-16473: Fix race condition in shard split when a sub-shard is put in recovery state. (Andy Vuong via Bruno Roustant)Build---------------------diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.javaindex 0193e0b1939..0212db16ed2 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java@@ -38,6 +38,7 @@ import java.util.List;import java.util.Map;import java.util.NoSuchElementException;import java.util.Set;+import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.atomic.AtomicReference;import org.apache.solr.client.solrj.cloud.DistribStateManager;@@ -779,6 +780,20 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {} else {ccc.offerStateUpdate(m);}+ // Wait for the sub-shards to change to the RECOVERY state before creating the replica+ // cores. Otherwise, there is a race condition and some recovery updates may be lost.+ zkStateReader.waitForState(+ collectionName,+ 60,+ TimeUnit.SECONDS,+ (collectionState) -> {+ for (String subSlice : subSlices) {+ if (!collectionState.getSlice(subSlice).getState().equals(Slice.State.RECOVERY)) {+ return false;+ }+ }+ return true;+ });}t = timings.sub("createCoresForReplicas");