diff options
| author | Simon Gratzer <simon.gratzer@mongodb.com> | 2021-05-11 14:06:06 +0200 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-02 08:33:08 +0000 |
| commit | 735cbebabcb7556be01d855d56a705ca5c9df74a (patch) | |
| tree | e4d495e8b4dbd4998828f96c5f5ddb9367f751a6 /src/mongo/db/s/config/configsvr_merge_chunk_command.cpp | |
| parent | 466ace369b8bb25a7e643f4c9d1f05f465f1bb09 (diff) | |
| download | mongo-735cbebabcb7556be01d855d56a705ca5c9df74a.tar.gz | |
SERVER-48648 Return updated ShardVersion in _configsvrCommitChunkMerge to avoid blind metadata refresh (BACKPORT-9094)
Diffstat (limited to 'src/mongo/db/s/config/configsvr_merge_chunk_command.cpp')
| -rw-r--r-- | src/mongo/db/s/config/configsvr_merge_chunk_command.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp index e9ad4d92564..757ca45b243 100644 --- a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp +++ b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp @@ -112,13 +112,15 @@ public: auto parsedRequest = uassertStatusOK(MergeChunkRequest::parseFromConfigCommand(cmdObj)); - uassertStatusOK( + const BSONObj shardVers = uassertStatusOK( ShardingCatalogManager::get(opCtx)->commitChunkMerge(opCtx, parsedRequest.getNamespace(), parsedRequest.getEpoch(), parsedRequest.getChunkBoundaries(), parsedRequest.getShardName(), parsedRequest.getValidAfter())); + result.appendElements(shardVers); + return true; } |