From fab8bda84690299be8cce769309f4711484b3508 Mon Sep 17 00:00:00 2001 From: Benety Goh Date: Tue, 13 Feb 2018 14:43:17 -0500 Subject: SERVER-32776 ReplicationCoordinator::prepareReplMetadata no longer requires OperationContext The OperationContext was previously used to retrieve the rollback ID from the ReplicationProcess. --- src/mongo/client/embedded/replication_coordinator_embedded.cpp | 3 +-- src/mongo/client/embedded/replication_coordinator_embedded.h | 5 +---- src/mongo/client/embedded/service_entry_point_embedded.cpp | 2 +- src/mongo/db/repl/replication_coordinator.h | 3 +-- src/mongo/db/repl/replication_coordinator_impl.cpp | 3 +-- src/mongo/db/repl/replication_coordinator_impl.h | 3 +-- src/mongo/db/repl/replication_coordinator_impl_test.cpp | 1 - src/mongo/db/repl/replication_coordinator_mock.cpp | 3 +-- src/mongo/db/repl/replication_coordinator_mock.h | 3 +-- src/mongo/db/service_entry_point_mongod.cpp | 2 +- 10 files changed, 9 insertions(+), 19 deletions(-) (limited to 'src/mongo') diff --git a/src/mongo/client/embedded/replication_coordinator_embedded.cpp b/src/mongo/client/embedded/replication_coordinator_embedded.cpp index 4c08b737245..c257f050e33 100644 --- a/src/mongo/client/embedded/replication_coordinator_embedded.cpp +++ b/src/mongo/client/embedded/replication_coordinator_embedded.cpp @@ -392,8 +392,7 @@ Status ReplicationCoordinatorEmbedded::processReplSetRequestVotes(OperationConte UASSERT_NOT_IMPLEMENTED; } -void ReplicationCoordinatorEmbedded::prepareReplMetadata(OperationContext*, - const BSONObj&, +void ReplicationCoordinatorEmbedded::prepareReplMetadata(const BSONObj&, const OpTime&, BSONObjBuilder*) const { UASSERT_NOT_IMPLEMENTED; diff --git a/src/mongo/client/embedded/replication_coordinator_embedded.h b/src/mongo/client/embedded/replication_coordinator_embedded.h index 0612e6cc6cf..e131b8e9449 100644 --- a/src/mongo/client/embedded/replication_coordinator_embedded.h +++ b/src/mongo/client/embedded/replication_coordinator_embedded.h @@ -207,10 +207,7 @@ public: const repl::ReplSetRequestVotesArgs&, repl::ReplSetRequestVotesResponse*) override; - void prepareReplMetadata(OperationContext*, - const BSONObj&, - const repl::OpTime&, - BSONObjBuilder*) const override; + void prepareReplMetadata(const BSONObj&, const repl::OpTime&, BSONObjBuilder*) const override; Status processHeartbeatV1(const repl::ReplSetHeartbeatArgsV1&, repl::ReplSetHeartbeatResponse*) override; diff --git a/src/mongo/client/embedded/service_entry_point_embedded.cpp b/src/mongo/client/embedded/service_entry_point_embedded.cpp index 5349c338ee0..f1a6065c191 100644 --- a/src/mongo/client/embedded/service_entry_point_embedded.cpp +++ b/src/mongo/client/embedded/service_entry_point_embedded.cpp @@ -269,7 +269,7 @@ void appendReplyMetadata(OperationContext* opCtx, // Attach our own last opTime. repl::OpTime lastOpTimeFromClient = repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp(); - replCoord->prepareReplMetadata(opCtx, request.body, lastOpTimeFromClient, metadataBob); + replCoord->prepareReplMetadata(request.body, lastOpTimeFromClient, metadataBob); // For commands from mongos, append some info to help getLastError(w) work. // TODO: refactor out of here as part of SERVER-18236 if (isShardingAware || isConfig) { diff --git a/src/mongo/db/repl/replication_coordinator.h b/src/mongo/db/repl/replication_coordinator.h index a7ecc4456c6..bce17fa9ea6 100644 --- a/src/mongo/db/repl/replication_coordinator.h +++ b/src/mongo/db/repl/replication_coordinator.h @@ -760,8 +760,7 @@ public: * Prepares a metadata object with the ReplSetMetadata and the OplogQueryMetadata depending * on what has been requested. */ - virtual void prepareReplMetadata(OperationContext* opCtx, - const BSONObj& metadataRequestObj, + virtual void prepareReplMetadata(const BSONObj& metadataRequestObj, const OpTime& lastOpTimeFromClient, BSONObjBuilder* builder) const = 0; diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 7c512259830..3c54e3a1931 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -3179,8 +3179,7 @@ Status ReplicationCoordinatorImpl::processReplSetRequestVotes( return Status::OK(); } -void ReplicationCoordinatorImpl::prepareReplMetadata(OperationContext* opCtx, - const BSONObj& metadataRequestObj, +void ReplicationCoordinatorImpl::prepareReplMetadata(const BSONObj& metadataRequestObj, const OpTime& lastOpTimeFromClient, BSONObjBuilder* builder) const { diff --git a/src/mongo/db/repl/replication_coordinator_impl.h b/src/mongo/db/repl/replication_coordinator_impl.h index f877768973b..910a829ac55 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.h +++ b/src/mongo/db/repl/replication_coordinator_impl.h @@ -271,8 +271,7 @@ public: const ReplSetRequestVotesArgs& args, ReplSetRequestVotesResponse* response) override; - virtual void prepareReplMetadata(OperationContext* opCtx, - const BSONObj& metadataRequestObj, + virtual void prepareReplMetadata(const BSONObj& metadataRequestObj, const OpTime& lastOpTimeFromClient, BSONObjBuilder* builder) const override; diff --git a/src/mongo/db/repl/replication_coordinator_impl_test.cpp b/src/mongo/db/repl/replication_coordinator_impl_test.cpp index 12885aa2729..d8beeb606d9 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_test.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_test.cpp @@ -4356,7 +4356,6 @@ TEST_F(ReplCoordTest, PrepareOplogQueryMetadata) { BSONObjBuilder metadataBob; getReplCoord()->prepareReplMetadata( - opCtx.get(), BSON(rpc::kOplogQueryMetadataFieldName << 1 << rpc::kReplSetMetadataFieldName << 1), OpTime(), &metadataBob); diff --git a/src/mongo/db/repl/replication_coordinator_mock.cpp b/src/mongo/db/repl/replication_coordinator_mock.cpp index f43b349f4d7..25141375b23 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.cpp +++ b/src/mongo/db/repl/replication_coordinator_mock.cpp @@ -423,8 +423,7 @@ Status ReplicationCoordinatorMock::processReplSetRequestVotes( return Status::OK(); } -void ReplicationCoordinatorMock::prepareReplMetadata(OperationContext* opCtx, - const BSONObj& metadataRequestObj, +void ReplicationCoordinatorMock::prepareReplMetadata(const BSONObj& metadataRequestObj, const OpTime& lastOpTimeFromClient, BSONObjBuilder* builder) const {} diff --git a/src/mongo/db/repl/replication_coordinator_mock.h b/src/mongo/db/repl/replication_coordinator_mock.h index 244c9231b0e..afcb5daf6df 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.h +++ b/src/mongo/db/repl/replication_coordinator_mock.h @@ -226,8 +226,7 @@ public: const ReplSetRequestVotesArgs& args, ReplSetRequestVotesResponse* response); - void prepareReplMetadata(OperationContext* opCtx, - const BSONObj& metadataRequestObj, + void prepareReplMetadata(const BSONObj& metadataRequestObj, const OpTime& lastOpTimeFromClient, BSONObjBuilder* builder) const override; diff --git a/src/mongo/db/service_entry_point_mongod.cpp b/src/mongo/db/service_entry_point_mongod.cpp index 69235c1e0c5..9dd7f9f8771 100644 --- a/src/mongo/db/service_entry_point_mongod.cpp +++ b/src/mongo/db/service_entry_point_mongod.cpp @@ -272,7 +272,7 @@ void appendReplyMetadata(OperationContext* opCtx, // Attach our own last opTime. repl::OpTime lastOpTimeFromClient = repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp(); - replCoord->prepareReplMetadata(opCtx, request.body, lastOpTimeFromClient, metadataBob); + replCoord->prepareReplMetadata(request.body, lastOpTimeFromClient, metadataBob); // For commands from mongos, append some info to help getLastError(w) work. // TODO: refactor out of here as part of SERVER-18236 if (isShardingAware || isConfig) { -- cgit v1.2.1