summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/split_chunk.cpp
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2018-12-05 17:08:48 -0500
committerRandolph Tan <randolph@10gen.com>2019-01-04 16:17:30 -0500
commit62076130c3321f842f3ce4fb426aefc078074206 (patch)
treec7b2c756fc95bb18794ac91212d8fc386be00d4a /src/mongo/db/s/split_chunk.cpp
parente3eaddbf01d4c0939370b117a44b60069b68158e (diff)
downloadmongo-62076130c3321f842f3ce4fb426aefc078074206.tar.gz
SERVER-37853 Create sharded_core_txn with balancer suite
Diffstat (limited to 'src/mongo/db/s/split_chunk.cpp')
-rw-r--r--src/mongo/db/s/split_chunk.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mongo/db/s/split_chunk.cpp b/src/mongo/db/s/split_chunk.cpp
index b1cb6c5a93e..ddb7d5a9f53 100644
--- a/src/mongo/db/s/split_chunk.cpp
+++ b/src/mongo/db/s/split_chunk.cpp
@@ -136,13 +136,12 @@ StatusWith<boost::optional<ChunkRange>> splitChunk(OperationContext* opCtx,
const std::string& shardName,
const OID& expectedCollectionEpoch) {
//
- // Lock the collection's metadata and get highest version for the current shard
// TODO(SERVER-25086): Remove distLock acquisition from split chunk
//
const std::string whyMessage(
str::stream() << "splitting chunk " << chunkRange.toString() << " in " << nss.toString());
auto scopedDistLock = Grid::get(opCtx)->catalogClient()->getDistLockManager()->lock(
- opCtx, nss.ns(), whyMessage, DistLockManager::kSingleLockAttemptTimeout);
+ opCtx, nss.ns(), whyMessage, DistLockManager::kDefaultLockTimeout);
if (!scopedDistLock.isOK()) {
return scopedDistLock.getStatus().withContext(
str::stream() << "could not acquire collection lock for " << nss.toString()