Merge pull request #3888 from dongxinEric/bugfix/3885/fix-silient-se-commit-failure

Fix a silent commit failure in SS commit pipeline
This commit is contained in:
Steve Atherton 2020-10-13 02:11:15 -07:00 committed by GitHub
commit 69c6b2aa3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3273,6 +3273,9 @@ ACTOR Future<bool> asyncPrepareVersionsForCommit_impl(StorageServerDisk* self, S
}
if (stopEarly.isReady()) {
// Previous commit is done.
if (stopEarly.isError()) {
throw stopEarly.getError();
}
break;
}
} else {
@ -3297,7 +3300,8 @@ ACTOR Future<bool> asyncPrepareVersionsForCommit_impl(StorageServerDisk* self, S
// Set the new durable version as part of the outstanding change set, before commit
data->storage.makeVersionDurable( newOldestVersion );
}
debug_advanceMaxCommittedVersion( data->thisServerID, newOldestVersion );
debug_advanceMaxCommittedVersion(data->thisServerID, newOldestVersion);
wait(forgetter.signal());
return finalCommit;
}