diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-08-17 12:44:13 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2015-08-19 12:21:50 -0400 |
| commit | 1b410805cf1e06051f9d14a20f176859a0130080 (patch) | |
| tree | 9c101a1f995cdefe677926d098bb6459ba62293c /src/mongo/s/server.cpp | |
| parent | 2d8d8c8cceb7af6f886e7f7dbdfbd38bb7cce85a (diff) | |
| download | mongo-1b410805cf1e06051f9d14a20f176859a0130080.tar.gz | |
SERVER-19543 Use ForwardingCatalogManager to acquire distributed locks outside catalog managers.
Makes the grid.catalogManager() return a ForwardingCatalogManager* and
eliminates the CatalogManagerGuard, as guard functionality will be
internal to ForwardingCatalogManager.
Diffstat (limited to 'src/mongo/s/server.cpp')
| -rw-r--r-- | src/mongo/s/server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index 7467d763ec8..9a06c1e7130 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -57,7 +57,7 @@ #include "mongo/db/startup_warnings_common.h" #include "mongo/platform/process_id.h" #include "mongo/s/balance.h" -#include "mongo/s/catalog/catalog_manager.h" +#include "mongo/s/catalog/forwarding_catalog_manager.h" #include "mongo/s/client/sharding_connection_hook.h" #include "mongo/s/config.h" #include "mongo/s/cursors.h" |