diff options
author | Randolph Tan <randolph@10gen.com> | 2017-09-28 10:45:49 -0400 |
---|---|---|
committer | Randolph Tan <randolph@10gen.com> | 2017-09-28 10:45:49 -0400 |
commit | f24fbb0011c6ded9101f08574e7cd07e63690a9b (patch) | |
tree | e1452828e142748f1f03be61a00c32dbb3ed6bc1 /src/mongo/db/s/collection_sharding_state.cpp | |
parent | d293f6857bcb36b26ca8fa03d90299714fe060de (diff) | |
download | mongo-f24fbb0011c6ded9101f08574e7cd07e63690a9b.tar.gz |
Revert "Revert "Revert "SERVER-30894 Implement command for transferring session information during migration"""
This reverts commit aaa0c96532ba6a8ea9146e4298c6bf1cc6b27f9e.
Diffstat (limited to 'src/mongo/db/s/collection_sharding_state.cpp')
-rw-r--r-- | src/mongo/db/s/collection_sharding_state.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/mongo/db/s/collection_sharding_state.cpp b/src/mongo/db/s/collection_sharding_state.cpp index 575c442ac74..9e6477c1d4b 100644 --- a/src/mongo/db/s/collection_sharding_state.cpp +++ b/src/mongo/db/s/collection_sharding_state.cpp @@ -267,9 +267,7 @@ boost::optional<KeyRange> CollectionShardingState::getNextOrphanRange(BSONObj co return _metadataManager->getNextOrphanRange(from); } -void CollectionShardingState::onInsertOp(OperationContext* opCtx, - const BSONObj& insertedDoc, - const Timestamp& oplogTs) { +void CollectionShardingState::onInsertOp(OperationContext* opCtx, const BSONObj& insertedDoc) { dassert(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_IX)); if (serverGlobalParams.clusterRole == ClusterRole::ShardServer) { @@ -293,16 +291,14 @@ void CollectionShardingState::onInsertOp(OperationContext* opCtx, checkShardVersionOrThrow(opCtx); if (_sourceMgr) { - _sourceMgr->getCloner()->onInsertOp(opCtx, insertedDoc, oplogTs); + _sourceMgr->getCloner()->onInsertOp(opCtx, insertedDoc); } } void CollectionShardingState::onUpdateOp(OperationContext* opCtx, const BSONObj& query, const BSONObj& update, - const BSONObj& updatedDoc, - const Timestamp& oplogTs, - const Timestamp& prePostImageTs) { + const BSONObj& updatedDoc) { dassert(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_IX)); if (serverGlobalParams.clusterRole == ClusterRole::ShardServer) { @@ -319,7 +315,7 @@ void CollectionShardingState::onUpdateOp(OperationContext* opCtx, checkShardVersionOrThrow(opCtx); if (_sourceMgr) { - _sourceMgr->getCloner()->onUpdateOp(opCtx, updatedDoc, oplogTs, prePostImageTs); + _sourceMgr->getCloner()->onUpdateOp(opCtx, updatedDoc); } } @@ -328,10 +324,7 @@ auto CollectionShardingState::makeDeleteState(BSONObj const& doc) -> DeleteState _sourceMgr && _sourceMgr->getCloner()->isDocumentInMigratingChunk(doc)}; } -void CollectionShardingState::onDeleteOp(OperationContext* opCtx, - const DeleteState& deleteState, - const Timestamp& oplogTs, - const Timestamp& preImageTs) { +void CollectionShardingState::onDeleteOp(OperationContext* opCtx, const DeleteState& deleteState) { dassert(opCtx->lockState()->isCollectionLockedForMode(_nss.ns(), MODE_IX)); if (serverGlobalParams.clusterRole == ClusterRole::ShardServer) { @@ -372,7 +365,7 @@ void CollectionShardingState::onDeleteOp(OperationContext* opCtx, checkShardVersionOrThrow(opCtx); if (_sourceMgr && deleteState.isMigrating) { - _sourceMgr->getCloner()->onDeleteOp(opCtx, deleteState.documentKey, oplogTs, preImageTs); + _sourceMgr->getCloner()->onDeleteOp(opCtx, deleteState.documentKey); } } |