Skip to content

SOLR-13855: DistributedZkUpdateProcessor needs to propagate finish() #969

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

Closed
wants to merge 2 commits into from
Closed

SOLR-13855: DistributedZkUpdateProcessor needs to propagate finish() #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56ef4de
SOLR-13855: DistributedZkUpdateProcessor needs to propagate finish()
dsmiley Oct 23, 2019
9393052
Always propagate
dsmiley Oct 23, 2019
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
12 changes: 7 additions & 5 deletions solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,15 +1089,17 @@ protected void doLocalCommit(CommitUpdateCommand cmd) throws IOException {
}

@Override
public void finish() throws IOException {
assertNotFinished();
public final void finish() throws IOException {
assert ! finished : "lifecycle sanity check";
finished = true;

doDistribFinish();

super.finish();
}

protected void assertNotFinished() {
assert ! finished : "lifecycle sanity check";
finished = true;
protected void doDistribFinish() throws IOException {
// no-op for derived classes to implement
}

/**
Expand Down
12 changes: 3 additions & 9 deletions solr/core/src/java/org/apache/solr/update/processor/DistributedZkUpdateProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,17 +1045,10 @@ public void processRollback(RollbackUpdateCommand cmd) throws IOException {
super.processRollback(cmd);
}

@Override
public void finish() throws IOException {
// TODO: optionally fail if n replicas are not reached...
protected void doDistribFinish() {
clusterState = zkController.getClusterState();

assertNotFinished();

doFinish();
}

// TODO: optionally fail if n replicas are not reached...
private void doFinish() {
boolean shouldUpdateTerms = isLeader && isIndexChanged;
if (shouldUpdateTerms) {
ZkShardTerms zkShardTerms = zkController.getShardTerms(cloudDesc.getCollectionName(), cloudDesc.getShardId());
Expand Down Expand Up @@ -1195,6 +1188,7 @@ private void doFinish() {
if (0 < errorsForClient.size()) {
throw new DistributedUpdatesAsyncException(errorsForClient);
}

}

/**
Expand Down