Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SAI-4486: force update collection if is missing #116

Open
wants to merge 1 commit into
base: fs/branch_9_2
Choose a base branch
from
Open

SAI-4486: force update collection if is missing #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion solr/core/src/java/org/apache/solr/cloud/ZkController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,14 @@ public String register(
// we will call register again after zk expiration and on reload
if (!afterExpiration && !core.isReloaded() && ulog != null && !isTlogReplicaAndNotLeader) {
// disable recovery in case shard is in construction state (for shard splits)
Slice slice = getClusterState().getCollection(collection).getSlice(shardId);
DocCollection coll = getClusterState().getCollectionOrNull(collection);
if(coll == null) {
//unlikely. But if we missed a zk state update we can do a force update
// and get again
zkStateReader.forceUpdateCollection(collection);
coll = getClusterState().getCollection(collection);
}
Slice slice = coll.getSlice(shardId);
if (slice.getState() != Slice.State.CONSTRUCTION || !isLeader) {
Future<UpdateLog.RecoveryInfo> recoveryFuture =
core.getUpdateHandler().getUpdateLog().recoverFromLog();
Expand Down