summaryrefslogtreecommitdiff
path: root/src/mongo/s/mongos_options.h
diff options
context:
space:
mode:
authorADAM David Alan Martin <adam.martin@10gen.com>2016-12-05 16:54:29 -0500
committerADAM David Alan Martin <adam.martin@10gen.com>2016-12-05 17:00:24 -0500
commit20ce1aa922673f758cc6c2edc47146c6314a4f57 (patch)
tree3ece6785ee81871af86f68bef3a86d4361c3d32b /src/mongo/s/mongos_options.h
parent25a351ee3225f3f957beb483d70382a19b7e2a0a (diff)
downloadmongo-20ce1aa922673f758cc6c2edc47146c6314a4f57.tar.gz
SERVER-27211 de-duplicate symbol `isMongos`
A hidden global variable representing the "is Mongos process" state can now be accessed and updated by the `is_mongos.h` interface. All tests defining their own versions (and test crutches) are replaced with calls to global registration of the desired state of this variable. The `mongos` main executable now sets this hidden global state as part of its startup code.
Diffstat (limited to 'src/mongo/s/mongos_options.h')
-rw-r--r--src/mongo/s/mongos_options.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mongo/s/mongos_options.h b/src/mongo/s/mongos_options.h
index 8ac3a1d9321..3e2f5ff4623 100644
--- a/src/mongo/s/mongos_options.h
+++ b/src/mongo/s/mongos_options.h
@@ -31,6 +31,7 @@
#include "mongo/base/status.h"
#include "mongo/client/connection_string.h"
#include "mongo/db/server_options.h"
+#include "mongo/s/is_mongos.h"
#include "mongo/util/options_parser/environment.h"
#include "mongo/util/options_parser/option_section.h"
@@ -78,8 +79,4 @@ Status validateMongosOptions(const moe::Environment& params);
Status canonicalizeMongosOptions(moe::Environment* params);
Status storeMongosOptions(const moe::Environment& params);
-
-// This function should eventually go away, but needs to be here now because the sorter and
-// the version manager must know at runtime which binary it is in.
-bool isMongos();
}