diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-02-02 10:00:19 -0500 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-02-02 15:38:47 -0500 |
commit | 721d2547c6c2883b522740dc2b7ff420aeebb7e9 (patch) | |
tree | 71a1d88efdde373f26577a792d54e8bbb1ffda5b /src/mongo/s/sharding_initialization.cpp | |
parent | ce3049c1eae2f8e22c0e47086dfa6c77aaab90f7 (diff) | |
download | mongo-721d2547c6c2883b522740dc2b7ff420aeebb7e9.tar.gz |
SERVER-29908 Move sharding_task_executor under mongo/s
Diffstat (limited to 'src/mongo/s/sharding_initialization.cpp')
-rw-r--r-- | src/mongo/s/sharding_initialization.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/s/sharding_initialization.cpp b/src/mongo/s/sharding_initialization.cpp index 3dd9b60f8ce..1bb4215fa2c 100644 --- a/src/mongo/s/sharding_initialization.cpp +++ b/src/mongo/s/sharding_initialization.cpp @@ -42,7 +42,6 @@ #include "mongo/db/logical_clock.h" #include "mongo/db/logical_time_validator.h" #include "mongo/db/repl/replication_coordinator.h" -#include "mongo/db/s/sharding_task_executor.h" #include "mongo/db/server_options.h" #include "mongo/db/server_parameters.h" #include "mongo/db/service_context.h" @@ -66,6 +65,7 @@ #include "mongo/s/cluster_identity_loader.h" #include "mongo/s/grid.h" #include "mongo/s/query/cluster_cursor_manager.h" +#include "mongo/s/sharding_task_executor.h" #include "mongo/stdx/memory.h" #include "mongo/util/exit.h" #include "mongo/util/log.h" @@ -278,7 +278,7 @@ Status waitForShardRegistryReload(OperationContext* opCtx) { try { uassertStatusOK(ClusterIdentityLoader::get(opCtx)->loadClusterId( opCtx, repl::ReadConcernLevel::kMajorityReadConcern)); - if (grid.shardRegistry()->isUp()) { + if (Grid::get(opCtx)->shardRegistry()->isUp()) { return Status::OK(); } sleepFor(kRetryInterval); |