diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2015-08-18 16:56:31 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@mongodb.com> | 2015-08-18 19:27:49 -0400 |
| commit | 5dd1be3ba35121f4ba501c322d48041ae748ac9c (patch) | |
| tree | 4eac913fa66515a55e5d6129c11a97058dc93e3c /src/mongo/s/grid.h | |
| parent | 594d851e53c85b2711db41034f9d42e1a0a5c25d (diff) | |
| download | mongo-5dd1be3ba35121f4ba501c322d48041ae748ac9c.tar.gz | |
SERVER-19543 SERVER-19992 Move ConfigServerMode enum from ServerGlobalParams to CatalogManager
Diffstat (limited to 'src/mongo/s/grid.h')
| -rw-r--r-- | src/mongo/s/grid.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/s/grid.h b/src/mongo/s/grid.h index 25edc60a5ea..6b5fe3e9ef9 100644 --- a/src/mongo/s/grid.h +++ b/src/mongo/s/grid.h @@ -31,7 +31,7 @@ #include <string> #include <vector> -#include "mongo/db/server_options.h" +#include "mongo/s/catalog/catalog_manager.h" #include "mongo/s/query/cluster_cursor_manager.h" #include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" @@ -41,7 +41,6 @@ namespace mongo { class BSONObj; class CatalogCache; -class CatalogManager; class DBConfig; class OperationContext; class SettingsType; @@ -113,13 +112,13 @@ public: } /** - * Compares desiredMode against _catalogManagerMode. Returns Status::OK() if they match, + * Compares desiredMode against _catalogManager->getMode(). Returns Status::OK() if they match, * returns ErrorCodes::IncompatibleCatalogManger if desiredMode is CSRS and the current mode is * SCCC. If desiredMode is SCCC and current mode is CSRS returns InvalidOperation as we do not * support downgrade. * TODO(spencer): Support downgrade. */ - Status checkIfCatalogNeedsSwapping(ServerGlobalParams::ConfigServerMode desiredMode); + Status checkIfCatalogNeedsSwapping(CatalogManager::ConfigServerMode desiredMode); /** * Clears the grid object so that it can be reused between test executions. This will not |