From d520be0814492c262515cf0a5d62a127ace70dce Mon Sep 17 00:00:00 2001 From: Andy Schwerin Date: Fri, 22 Jun 2018 12:00:21 -0400 Subject: SERVER-34798 Remove ServiceContext subclasses and use new ServiceContext in every unit test. This patch does several loosely related and surprisingly hard to separate things. 1.) Make the ServiceContext class final 2.) Create a mechanism, called ConstructorActions, for running methods on ServiceContexts immediately after they're built and immediately before they're destroyed. 3.) Introduce / improve test fixture base classes for tests, giving them fresh ServiceContext instances for each test case. There is one fixture for tests that need a storage engine and another for those that do not. 4.) Make several remaining global variables SC decorations in support of (3) 5.) Replace many MONGO_INITIALIZERS that access getGlobalServiceContext with the new constructor-actions system, which is needed for (3.) 6.) Fix up tests to use the fixtures from (3) and fix tests that silently used different service contexts in together in a technically illegal fashion that now breaks. 7.) Utilize (2) as necessary to simplify initialization of new ServiceContexts, simplifying the fixtures in (3). --- src/mongo/s/grid.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/mongo/s/grid.h') diff --git a/src/mongo/s/grid.h b/src/mongo/s/grid.h index 443c9b81304..02da388532b 100644 --- a/src/mongo/s/grid.h +++ b/src/mongo/s/grid.h @@ -200,8 +200,4 @@ private: bool _allowLocalShard{true}; }; -// Reference to the global Grid instance. Do not use in new code. Use one of the Grid::get methods -// instead. -extern Grid grid; - } // namespace mongo -- cgit v1.2.1