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:46:09 +0000
commit2d731cc96b0d09deaf4fbd20356f7901d4e70c4e (patch)
tree4674bd8a0f5bf05a2a39f50e65cad9dacff60e44
parent5a9f699eb3adced1fd4bc15ce8028d30bfe17fca (diff)
downloadmongo-2d731cc96b0d09deaf4fbd20356f7901d4e70c4e.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 1208f5a8b52..a430a2fac06 100644
--- a/src/mongo/db/s/merge_chunks_command.cpp
+++ b/src/mongo/db/s/merge_chunks_command.cpp
@@ -96,7 +96,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);
@@ -236,7 +236,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