From d0e6f87351312a299a17f6d63e3f2f4db834ae1f Mon Sep 17 00:00:00 2001 From: Esha Maharishi Date: Tue, 12 May 2020 17:26:45 -0400 Subject: SERVER-47992 Make disableResumableRangeDeleter just prevent ranges from being submitted for deletio --- src/mongo/db/s/start_chunk_clone_request.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src/mongo/db/s/start_chunk_clone_request.cpp') diff --git a/src/mongo/db/s/start_chunk_clone_request.cpp b/src/mongo/db/s/start_chunk_clone_request.cpp index e81f5754b90..86567dce161 100644 --- a/src/mongo/db/s/start_chunk_clone_request.cpp +++ b/src/mongo/db/s/start_chunk_clone_request.cpp @@ -152,12 +152,10 @@ StatusWith StartChunkCloneRequest::createFromCommand(Nam } } - if (obj.getField("uuid")) { - request._migrationId = UUID::parse(obj); - request._lsid = LogicalSessionId::parse(IDLParserErrorContext("StartChunkCloneRequest"), - obj[kLsid].Obj()); - request._txnNumber = obj.getField(kTxnNumber).Long(); - } + request._migrationId = UUID::parse(obj); + request._lsid = + LogicalSessionId::parse(IDLParserErrorContext("StartChunkCloneRequest"), obj[kLsid].Obj()); + request._txnNumber = obj.getField(kTxnNumber).Long(); return request; } @@ -175,19 +173,16 @@ void StartChunkCloneRequest::appendAsCommand( const BSONObj& chunkMinKey, const BSONObj& chunkMaxKey, const BSONObj& shardKeyPattern, - const MigrationSecondaryThrottleOptions& secondaryThrottle, - bool resumableRangeDeleterDisabled) { + const MigrationSecondaryThrottleOptions& secondaryThrottle) { invariant(builder->asTempObj().isEmpty()); invariant(nss.isValid()); invariant(fromShardConnectionString.isValid()); builder->append(kRecvChunkStart, nss.ns()); - if (!resumableRangeDeleterDisabled) { - migrationId.appendToBuilder(builder, kMigrationId); - builder->append(kLsid, lsid.toBSON()); - builder->append(kTxnNumber, txnNumber); - } + migrationId.appendToBuilder(builder, kMigrationId); + builder->append(kLsid, lsid.toBSON()); + builder->append(kTxnNumber, txnNumber); sessionId.append(builder); builder->append(kFromShardConnectionString, fromShardConnectionString.toString()); -- cgit v1.2.1