From b54d9905a167867a2655910799573378aff2ce89 Mon Sep 17 00:00:00 2001 From: Anton Korshunov Date: Thu, 7 Feb 2019 11:34:26 +0000 Subject: SERVER-37456 Make the global CursorManager a decoration on ServiceContext --- src/mongo/db/clientcursor.cpp | 2 +- src/mongo/db/commands/find_cmd.cpp | 19 +++++++-------- src/mongo/db/commands/getmore_cmd.cpp | 2 +- src/mongo/db/commands/killcursors_cmd.cpp | 4 ++-- src/mongo/db/commands/list_collections.cpp | 2 +- src/mongo/db/commands/list_indexes.cpp | 2 +- src/mongo/db/commands/repair_cursor.cpp | 2 +- src/mongo/db/commands/run_aggregate.cpp | 3 +-- src/mongo/db/cursor_manager.cpp | 28 ++++++++++++++++------ src/mongo/db/cursor_manager.h | 15 ++++++++++-- src/mongo/db/kill_sessions_local.cpp | 3 +-- src/mongo/db/logical_session_cache_impl.cpp | 2 +- .../db/pipeline/process_interface_standalone.cpp | 2 +- src/mongo/db/query/find.cpp | 4 ++-- src/mongo/db/run_op_kill_cursors.cpp | 2 +- src/mongo/db/service_entry_point_common.cpp | 2 +- src/mongo/db/service_liaison.h | 2 +- src/mongo/db/service_liaison_mock.cpp | 2 +- src/mongo/db/service_liaison_mock.h | 6 ++--- src/mongo/db/service_liaison_mongod.cpp | 6 ++--- src/mongo/db/service_liaison_mongod.h | 2 +- src/mongo/db/service_liaison_mongos.cpp | 2 +- src/mongo/db/service_liaison_mongos.h | 2 +- 23 files changed, 69 insertions(+), 47 deletions(-) (limited to 'src/mongo/db') diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp index fef5105a9a5..15f9d4f1b22 100644 --- a/src/mongo/db/clientcursor.cpp +++ b/src/mongo/db/clientcursor.cpp @@ -280,7 +280,7 @@ public: const ServiceContext::UniqueOperationContext opCtx = cc().makeOperationContext(); auto now = opCtx->getServiceContext()->getPreciseClockSource()->now(); cursorStatsTimedOut.increment( - CursorManager::getGlobalCursorManager()->timeoutCursors(opCtx.get(), now)); + CursorManager::get(opCtx.get())->timeoutCursors(opCtx.get(), now)); } MONGO_IDLE_THREAD_BLOCK; sleepsecs(getClientCursorMonitorFrequencySecs()); diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp index a73aef6375a..0fde452ab39 100644 --- a/src/mongo/db/commands/find_cmd.cpp +++ b/src/mongo/db/commands/find_cmd.cpp @@ -399,16 +399,15 @@ public: if (shouldSaveCursor(opCtx, collection, state, exec.get())) { // Create a ClientCursor containing this plan executor and register it with the // cursor manager. - ClientCursorPin pinnedCursor = - CursorManager::getGlobalCursorManager()->registerCursor( - opCtx, - {std::move(exec), - nss, - AuthorizationSession::get(opCtx->getClient())->getAuthenticatedUserNames(), - repl::ReadConcernArgs::get(opCtx), - _request.body, - ClientCursorParams::LockPolicy::kLockExternally, - {Privilege(ResourcePattern::forExactNamespace(nss), ActionType::find)}}); + ClientCursorPin pinnedCursor = CursorManager::get(opCtx)->registerCursor( + opCtx, + {std::move(exec), + nss, + AuthorizationSession::get(opCtx->getClient())->getAuthenticatedUserNames(), + repl::ReadConcernArgs::get(opCtx), + _request.body, + ClientCursorParams::LockPolicy::kLockExternally, + {Privilege(ResourcePattern::forExactNamespace(nss), ActionType::find)}}); cursorId = pinnedCursor.getCursor()->cursorid(); invariant(!exec); diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp index 76bd4507d8e..350383d706f 100644 --- a/src/mongo/db/commands/getmore_cmd.cpp +++ b/src/mongo/db/commands/getmore_cmd.cpp @@ -304,7 +304,7 @@ public: boost::optional readLock; boost::optional statsTracker; - auto cursorManager = CursorManager::getGlobalCursorManager(); + auto cursorManager = CursorManager::get(opCtx); auto cursorPin = uassertStatusOK(cursorManager->pinCursor(opCtx, _request.cursorid)); if (cursorPin->lockPolicy() == ClientCursorParams::LockPolicy::kLocksInternally) { diff --git a/src/mongo/db/commands/killcursors_cmd.cpp b/src/mongo/db/commands/killcursors_cmd.cpp index 6efecd22edc..dd820011c0f 100644 --- a/src/mongo/db/commands/killcursors_cmd.cpp +++ b/src/mongo/db/commands/killcursors_cmd.cpp @@ -67,7 +67,7 @@ public: private: Status _checkAuth(Client* client, const NamespaceString& nss, CursorId id) const final { auto opCtx = client->getOperationContext(); - return CursorManager::getGlobalCursorManager()->checkAuthForKillCursors(opCtx, id); + return CursorManager::get(opCtx)->checkAuthForKillCursors(opCtx, id); } Status _killCursor(OperationContext* opCtx, @@ -83,7 +83,7 @@ private: dbProfilingLevel); } - auto cursorManager = CursorManager::getGlobalCursorManager(); + auto cursorManager = CursorManager::get(opCtx); return cursorManager->killCursor(opCtx, id, true /* shouldAudit */); } } killCursorsCmd; diff --git a/src/mongo/db/commands/list_collections.cpp b/src/mongo/db/commands/list_collections.cpp index df886abf938..905ad7217ba 100644 --- a/src/mongo/db/commands/list_collections.cpp +++ b/src/mongo/db/commands/list_collections.cpp @@ -380,7 +380,7 @@ public: exec->detachFromOperationContext(); } // Drop db lock. Global cursor registration must be done without holding any locks. - auto pinnedCursor = CursorManager::getGlobalCursorManager()->registerCursor( + auto pinnedCursor = CursorManager::get(opCtx)->registerCursor( opCtx, {std::move(exec), cursorNss, diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp index 8c4b15606dc..65b63a14570 100644 --- a/src/mongo/db/commands/list_indexes.cpp +++ b/src/mongo/db/commands/list_indexes.cpp @@ -220,7 +220,7 @@ public: } // Drop collection lock. Global cursor registration must be done without holding any // locks. - const auto pinnedCursor = CursorManager::getGlobalCursorManager()->registerCursor( + const auto pinnedCursor = CursorManager::get(opCtx)->registerCursor( opCtx, {std::move(exec), nss, diff --git a/src/mongo/db/commands/repair_cursor.cpp b/src/mongo/db/commands/repair_cursor.cpp index 04c4d29fc49..6c6c764d328 100644 --- a/src/mongo/db/commands/repair_cursor.cpp +++ b/src/mongo/db/commands/repair_cursor.cpp @@ -101,7 +101,7 @@ public: exec->saveState(); exec->detachFromOperationContext(); - auto pinnedCursor = CursorManager::getGlobalCursorManager()->registerCursor( + auto pinnedCursor = CursorManager::get(opCtx)->registerCursor( opCtx, {std::move(exec), ns, diff --git a/src/mongo/db/commands/run_aggregate.cpp b/src/mongo/db/commands/run_aggregate.cpp index a8cefeb2caf..07cd48fbc80 100644 --- a/src/mongo/db/commands/run_aggregate.cpp +++ b/src/mongo/db/commands/run_aggregate.cpp @@ -645,8 +645,7 @@ Status runAggregate(OperationContext* opCtx, cursorParams.setAwaitData(true); } - auto pin = - CursorManager::getGlobalCursorManager()->registerCursor(opCtx, std::move(cursorParams)); + auto pin = CursorManager::get(opCtx)->registerCursor(opCtx, std::move(cursorParams)); cursors.emplace_back(pin.getCursor()); pins.emplace_back(std::move(pin)); } diff --git a/src/mongo/db/cursor_manager.cpp b/src/mongo/db/cursor_manager.cpp index 3479b122b47..37beb7e8f19 100644 --- a/src/mongo/db/cursor_manager.cpp +++ b/src/mongo/db/cursor_manager.cpp @@ -62,16 +62,30 @@ namespace mongo { constexpr int CursorManager::kNumPartitions; -std::unique_ptr globalCursorManager; +namespace { -MONGO_INITIALIZER(GlobalCursorManager) -(InitializerContext* context) { - globalCursorManager = std::make_unique(); - return Status::OK(); +const auto serviceCursorManager = + ServiceContext::declareDecoration>(); + +ServiceContext::ConstructorActionRegisterer cursorManagerRegisterer{ + "CursorManagerRegisterer", [](ServiceContext* svcCtx) { + auto cursorManager = stdx::make_unique(); + CursorManager::set(svcCtx, std::move(cursorManager)); + }}; +} // namespace + +CursorManager* CursorManager::get(ServiceContext* svcCtx) { + return serviceCursorManager(svcCtx).get(); +} + +CursorManager* CursorManager::get(OperationContext* optCtx) { + return get(optCtx->getServiceContext()); } -CursorManager* CursorManager::getGlobalCursorManager() { - return globalCursorManager.get(); +void CursorManager::set(ServiceContext* svcCtx, std::unique_ptr newCursorManager) { + invariant(newCursorManager); + auto& cursorManager = serviceCursorManager(svcCtx); + cursorManager = std::move(newCursorManager); } std::pair CursorManager::killCursorsWithMatchingSessions( diff --git a/src/mongo/db/cursor_manager.h b/src/mongo/db/cursor_manager.h index f05beb73dc4..0def0d520d1 100644 --- a/src/mongo/db/cursor_manager.h +++ b/src/mongo/db/cursor_manager.h @@ -69,9 +69,20 @@ class PlanExecutor; class CursorManager { public: /** - * Returns a pointer to the process-global cursor manager. + * Returns a pointer to the cursor manager defined within the specified ServiceContext. */ - static CursorManager* getGlobalCursorManager(); + static CursorManager* get(ServiceContext* svcCtx); + + /** + * Returns a pointer to the cursor manager defined within the specified OperationContext. + */ + static CursorManager* get(OperationContext* opCtx); + + /** + * Registers the new cursor manager within the specified ServiceContext. + */ + static void set(ServiceContext* svcCtx, std::unique_ptr newCursorManager); + CursorManager(); diff --git a/src/mongo/db/kill_sessions_local.cpp b/src/mongo/db/kill_sessions_local.cpp index d244143ed4e..da0cd84a1e3 100644 --- a/src/mongo/db/kill_sessions_local.cpp +++ b/src/mongo/db/kill_sessions_local.cpp @@ -105,8 +105,7 @@ SessionKiller::Result killSessionsLocal(OperationContext* opCtx, killSessionsAbortUnpreparedTransactions(opCtx, matcher); uassertStatusOK(killSessionsLocalKillOps(opCtx, matcher)); - auto res = - CursorManager::getGlobalCursorManager()->killCursorsWithMatchingSessions(opCtx, matcher); + auto res = CursorManager::get(opCtx)->killCursorsWithMatchingSessions(opCtx, matcher); uassertStatusOK(res.first); return {std::vector{}}; diff --git a/src/mongo/db/logical_session_cache_impl.cpp b/src/mongo/db/logical_session_cache_impl.cpp index f7afce2fc3a..cb7270d10c5 100644 --- a/src/mongo/db/logical_session_cache_impl.cpp +++ b/src/mongo/db/logical_session_cache_impl.cpp @@ -385,7 +385,7 @@ void LogicalSessionCacheImpl::_refresh(Client* client) { KillAllSessionsByPatternSet patterns; - auto openCursorSessions = _service->getOpenCursorSessions(); + auto openCursorSessions = _service->getOpenCursorSessions(opCtx); // Exclude sessions added to _activeSessions from the openCursorSession to avoid race between // killing cursors on the removed sessions and creating sessions. { diff --git a/src/mongo/db/pipeline/process_interface_standalone.cpp b/src/mongo/db/pipeline/process_interface_standalone.cpp index 1cd3d461ab4..56150b9535e 100644 --- a/src/mongo/db/pipeline/process_interface_standalone.cpp +++ b/src/mongo/db/pipeline/process_interface_standalone.cpp @@ -383,7 +383,7 @@ std::vector MongoInterfaceStandalone::collectDocumentKeyFieldsActingA std::vector MongoInterfaceStandalone::getIdleCursors( const intrusive_ptr& expCtx, CurrentOpUserMode userMode) const { - return CursorManager::getGlobalCursorManager()->getIdleCursors(expCtx->opCtx, userMode); + return CursorManager::get(expCtx->opCtx)->getIdleCursors(expCtx->opCtx, userMode); } boost::optional MongoInterfaceStandalone::lookupSingleDocument( diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp index 7469cbd6746..6671d0afed2 100644 --- a/src/mongo/db/query/find.cpp +++ b/src/mongo/db/query/find.cpp @@ -279,7 +279,7 @@ Message getMore(OperationContext* opCtx, // These are set in the QueryResult msg we return. int resultFlags = ResultFlag_AwaitCapable; - auto cursorManager = CursorManager::getGlobalCursorManager(); + auto cursorManager = CursorManager::get(opCtx); auto statusWithCursorPin = cursorManager->pinCursor(opCtx, cursorid); if (statusWithCursorPin == ErrorCodes::CursorNotFound) { return makeCursorNotFoundResponse(); @@ -717,7 +717,7 @@ std::string runQuery(OperationContext* opCtx, const auto& readConcernArgs = repl::ReadConcernArgs::get(opCtx); // Allocate a new ClientCursor and register it with the cursor manager. - ClientCursorPin pinnedCursor = CursorManager::getGlobalCursorManager()->registerCursor( + ClientCursorPin pinnedCursor = CursorManager::get(opCtx)->registerCursor( opCtx, {std::move(exec), nss, diff --git a/src/mongo/db/run_op_kill_cursors.cpp b/src/mongo/db/run_op_kill_cursors.cpp index bbade52a554..cb7dbf6f3e0 100644 --- a/src/mongo/db/run_op_kill_cursors.cpp +++ b/src/mongo/db/run_op_kill_cursors.cpp @@ -44,7 +44,7 @@ namespace mongo { namespace { bool killCursorIfAuthorized(OperationContext* opCtx, CursorId id) { - auto cursorManager = CursorManager::getGlobalCursorManager(); + auto cursorManager = CursorManager::get(opCtx); auto pin = cursorManager->pinCursor(opCtx, id, CursorManager::kNoCheckSession); if (!pin.isOK()) { diff --git a/src/mongo/db/service_entry_point_common.cpp b/src/mongo/db/service_entry_point_common.cpp index e9519e89b80..2142a5b7faa 100644 --- a/src/mongo/db/service_entry_point_common.cpp +++ b/src/mongo/db/service_entry_point_common.cpp @@ -1108,7 +1108,7 @@ DbResponse receivedGetMore(OperationContext* opCtx, // // If killing the cursor fails, ignore the error and don't try again. The cursor should // be reaped by the client cursor timeout thread. - CursorManager::getGlobalCursorManager() + CursorManager::get(opCtx) ->killCursor(opCtx, cursorid, false /* shouldAudit */) .ignore(); } diff --git a/src/mongo/db/service_liaison.h b/src/mongo/db/service_liaison.h index 854e0b5d240..db9db61ddd9 100644 --- a/src/mongo/db/service_liaison.h +++ b/src/mongo/db/service_liaison.h @@ -60,7 +60,7 @@ public: /** * Return a list of sessions that are currently attached to open cursors */ - virtual LogicalSessionIdSet getOpenCursorSessions() const = 0; + virtual LogicalSessionIdSet getOpenCursorSessions(OperationContext* opCtx) const = 0; /** * Schedule a job to be run at regular intervals until the server shuts down. diff --git a/src/mongo/db/service_liaison_mock.cpp b/src/mongo/db/service_liaison_mock.cpp index 8193943090e..bcc88d987ec 100644 --- a/src/mongo/db/service_liaison_mock.cpp +++ b/src/mongo/db/service_liaison_mock.cpp @@ -49,7 +49,7 @@ LogicalSessionIdSet MockServiceLiaisonImpl::getActiveOpSessions() const { return _activeSessions; } -LogicalSessionIdSet MockServiceLiaisonImpl::getOpenCursorSessions() const { +LogicalSessionIdSet MockServiceLiaisonImpl::getOpenCursorSessions(OperationContext* opCtx) const { stdx::unique_lock lk(_mutex); return _cursorSessions; } diff --git a/src/mongo/db/service_liaison_mock.h b/src/mongo/db/service_liaison_mock.h index 327b04fd371..480cd5359f8 100644 --- a/src/mongo/db/service_liaison_mock.h +++ b/src/mongo/db/service_liaison_mock.h @@ -61,7 +61,7 @@ public: // Forwarding methods from the MockServiceLiaison LogicalSessionIdSet getActiveOpSessions() const; - LogicalSessionIdSet getOpenCursorSessions() const; + LogicalSessionIdSet getOpenCursorSessions(OperationContext* opCtx) const; Date_t now() const; void scheduleJob(PeriodicRunner::PeriodicJob job); void join(); @@ -105,8 +105,8 @@ public: return _impl->getActiveOpSessions(); } - LogicalSessionIdSet getOpenCursorSessions() const override { - return _impl->getOpenCursorSessions(); + LogicalSessionIdSet getOpenCursorSessions(OperationContext* opCtx) const override { + return _impl->getOpenCursorSessions(opCtx); } Date_t now() const override { diff --git a/src/mongo/db/service_liaison_mongod.cpp b/src/mongo/db/service_liaison_mongod.cpp index 364ed83438c..91ec14ed274 100644 --- a/src/mongo/db/service_liaison_mongod.cpp +++ b/src/mongo/db/service_liaison_mongod.cpp @@ -66,9 +66,9 @@ LogicalSessionIdSet ServiceLiaisonMongod::getActiveOpSessions() const { return activeSessions; } -LogicalSessionIdSet ServiceLiaisonMongod::getOpenCursorSessions() const { +LogicalSessionIdSet ServiceLiaisonMongod::getOpenCursorSessions(OperationContext* opCtx) const { LogicalSessionIdSet cursorSessions; - CursorManager::getGlobalCursorManager()->appendActiveSessions(&cursorSessions); + CursorManager::get(opCtx)->appendActiveSessions(&cursorSessions); return cursorSessions; } @@ -98,7 +98,7 @@ ServiceContext* ServiceLiaisonMongod::_context() { std::pair ServiceLiaisonMongod::killCursorsWithMatchingSessions( OperationContext* opCtx, const SessionKiller::Matcher& matcher) { - return CursorManager::getGlobalCursorManager()->killCursorsWithMatchingSessions(opCtx, matcher); + return CursorManager::get(opCtx)->killCursorsWithMatchingSessions(opCtx, matcher); } } // namespace mongo diff --git a/src/mongo/db/service_liaison_mongod.h b/src/mongo/db/service_liaison_mongod.h index 5cd081f8823..c812be6a8fd 100644 --- a/src/mongo/db/service_liaison_mongod.h +++ b/src/mongo/db/service_liaison_mongod.h @@ -53,7 +53,7 @@ namespace mongo { class ServiceLiaisonMongod : public ServiceLiaison { public: LogicalSessionIdSet getActiveOpSessions() const override; - LogicalSessionIdSet getOpenCursorSessions() const override; + LogicalSessionIdSet getOpenCursorSessions(OperationContext* opCtx) const override; void scheduleJob(PeriodicRunner::PeriodicJob job) override; diff --git a/src/mongo/db/service_liaison_mongos.cpp b/src/mongo/db/service_liaison_mongos.cpp index c52ec45fb6b..a34d619e682 100644 --- a/src/mongo/db/service_liaison_mongos.cpp +++ b/src/mongo/db/service_liaison_mongos.cpp @@ -66,7 +66,7 @@ LogicalSessionIdSet ServiceLiaisonMongos::getActiveOpSessions() const { return activeSessions; } -LogicalSessionIdSet ServiceLiaisonMongos::getOpenCursorSessions() const { +LogicalSessionIdSet ServiceLiaisonMongos::getOpenCursorSessions(OperationContext* opCtx) const { LogicalSessionIdSet openCursorSessions; invariant(hasGlobalServiceContext()); diff --git a/src/mongo/db/service_liaison_mongos.h b/src/mongo/db/service_liaison_mongos.h index ecf08d5d822..23173f4f684 100644 --- a/src/mongo/db/service_liaison_mongos.h +++ b/src/mongo/db/service_liaison_mongos.h @@ -53,7 +53,7 @@ namespace mongo { class ServiceLiaisonMongos : public ServiceLiaison { public: LogicalSessionIdSet getActiveOpSessions() const override; - LogicalSessionIdSet getOpenCursorSessions() const override; + LogicalSessionIdSet getOpenCursorSessions(OperationContext* opCtx) const override; void scheduleJob(PeriodicRunner::PeriodicJob job) override; -- cgit v1.2.1