summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Heppenstall <jamie.heppenstall@mongodb.com>2019-08-16 15:51:02 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-04-08 21:47:34 +0000
commitf6aa02a52d2ca5926fc142e7c421ce842553b2a5 (patch)
tree57f58814a07dbfc8bc6a7fb00182888296896990
parentf8f5c3f65176a018aff085066cd60955e9a245c2 (diff)
downloadmongo-f6aa02a52d2ca5926fc142e7c421ce842553b2a5.tar.gz
SERVER-42862 Set forceRefreshFromThisThread to true in forceShardFilteringMetadataRefresh in the mergeChunks command
(cherry picked from commit 8e4627ad9eb9b57a63d2893ce5096be773b32742)
-rw-r--r--src/mongo/db/s/merge_chunks_command.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp
index 75ea7635773..d6db92888e2 100644
--- a/src/mongo/db/s/merge_chunks_command.cpp
+++ b/src/mongo/db/s/merge_chunks_command.cpp
@@ -92,7 +92,7 @@ void mergeChunks(OperationContext* opCtx,
// We now have the collection distributed lock, refresh metadata to latest version and sanity
// check
- forceShardFilteringMetadataRefresh(opCtx, nss);
+ forceShardFilteringMetadataRefresh(opCtx, nss, true /* forceRefreshFromThisThread */);
const auto metadata = [&] {
AutoGetCollection autoColl(opCtx, nss, MODE_IS);
@@ -216,7 +216,7 @@ void mergeChunks(OperationContext* opCtx,
// Refresh metadata to pick up new chunk definitions (regardless of the results returned from
// running _configsvrCommitChunkMerge).
- forceShardFilteringMetadataRefresh(opCtx, nss);
+ forceShardFilteringMetadataRefresh(opCtx, nss, true /* forceRefreshFromThisThread */);
// If _configsvrCommitChunkMerge returned an error, look at this shard's metadata to determine
// if the merge actually did happen. This can happen if there's a network error getting the