summaryrefslogtreecommitdiff
path: root/src/mongo/s/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s/client')
-rw-r--r--src/mongo/s/client/shard_factory.cpp2
-rw-r--r--src/mongo/s/client/shard_factory.h4
-rw-r--r--src/mongo/s/client/shard_local_test.cpp2
-rw-r--r--src/mongo/s/client/shard_registry.cpp2
-rw-r--r--src/mongo/s/client/shard_registry.h2
-rw-r--r--src/mongo/s/client/shard_remote.cpp2
-rw-r--r--src/mongo/s/client/sharding_network_connection_hook.cpp2
-rw-r--r--src/mongo/s/client/version_manager.cpp30
8 files changed, 28 insertions, 18 deletions
diff --git a/src/mongo/s/client/shard_factory.cpp b/src/mongo/s/client/shard_factory.cpp
index cc5ca205a0f..bf71e7c62aa 100644
--- a/src/mongo/s/client/shard_factory.cpp
+++ b/src/mongo/s/client/shard_factory.cpp
@@ -34,8 +34,8 @@
#include "mongo/s/client/shard_factory.h"
#include "mongo/base/status_with.h"
-#include "mongo/client/remote_command_targeter.h"
#include "mongo/client/connection_string.h"
+#include "mongo/client/remote_command_targeter.h"
#include "mongo/stdx/memory.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/log.h"
diff --git a/src/mongo/s/client/shard_factory.h b/src/mongo/s/client/shard_factory.h
index caa6743e75b..c3a6ff8d8de 100644
--- a/src/mongo/s/client/shard_factory.h
+++ b/src/mongo/s/client/shard_factory.h
@@ -28,10 +28,10 @@
#pragma once
+#include <functional>
+#include <map>
#include <memory>
#include <string>
-#include <map>
-#include <functional>
#include "mongo/base/disallow_copying.h"
diff --git a/src/mongo/s/client/shard_local_test.cpp b/src/mongo/s/client/shard_local_test.cpp
index 214202d4a7d..f6e3009f97e 100644
--- a/src/mongo/s/client/shard_local_test.cpp
+++ b/src/mongo/s/client/shard_local_test.cpp
@@ -31,8 +31,8 @@
#include "mongo/s/client/shard_local.h"
#include "mongo/client/read_preference.h"
-#include "mongo/db/client.h"
#include "mongo/db/catalog/database_holder.h"
+#include "mongo/db/client.h"
#include "mongo/db/db_raii.h"
#include "mongo/db/query/find_and_modify_request.h"
#include "mongo/db/repl/replication_coordinator_global.h"
diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp
index 271346d6e86..fb9339b660c 100644
--- a/src/mongo/s/client/shard_registry.cpp
+++ b/src/mongo/s/client/shard_registry.cpp
@@ -42,8 +42,8 @@
#include "mongo/s/catalog/type_shard.h"
#include "mongo/s/client/shard.h"
#include "mongo/s/client/shard_connection.h"
-#include "mongo/s/grid.h"
#include "mongo/s/client/shard_factory.h"
+#include "mongo/s/grid.h"
#include "mongo/stdx/memory.h"
#include "mongo/stdx/mutex.h"
#include "mongo/util/log.h"
diff --git a/src/mongo/s/client/shard_registry.h b/src/mongo/s/client/shard_registry.h
index 66dc5d225ee..89502ff507a 100644
--- a/src/mongo/s/client/shard_registry.h
+++ b/src/mongo/s/client/shard_registry.h
@@ -29,10 +29,10 @@
#pragma once
#include <memory>
+#include <set>
#include <string>
#include <unordered_map>
#include <vector>
-#include <set>
#include "mongo/base/disallow_copying.h"
#include "mongo/db/jsobj.h"
diff --git a/src/mongo/s/client/shard_remote.cpp b/src/mongo/s/client/shard_remote.cpp
index ef033ff718a..9a31ee60424 100644
--- a/src/mongo/s/client/shard_remote.cpp
+++ b/src/mongo/s/client/shard_remote.cpp
@@ -42,8 +42,8 @@
#include "mongo/client/replica_set_monitor.h"
#include "mongo/db/jsobj.h"
#include "mongo/db/operation_context.h"
-#include "mongo/db/repl/read_concern_args.h"
#include "mongo/db/query/lite_parsed_query.h"
+#include "mongo/db/repl/read_concern_args.h"
#include "mongo/executor/task_executor_pool.h"
#include "mongo/rpc/get_status_from_command_result.h"
#include "mongo/rpc/metadata/repl_set_metadata.h"
diff --git a/src/mongo/s/client/sharding_network_connection_hook.cpp b/src/mongo/s/client/sharding_network_connection_hook.cpp
index 80e5b73460d..a6b7a071250 100644
--- a/src/mongo/s/client/sharding_network_connection_hook.cpp
+++ b/src/mongo/s/client/sharding_network_connection_hook.cpp
@@ -36,8 +36,8 @@
#include "mongo/executor/remote_command_request.h"
#include "mongo/executor/remote_command_response.h"
#include "mongo/rpc/get_status_from_command_result.h"
-#include "mongo/s/grid.h"
#include "mongo/s/client/shard_registry.h"
+#include "mongo/s/grid.h"
#include "mongo/s/set_shard_version_request.h"
#include "mongo/util/mongoutils/str.h"
#include "mongo/util/net/hostandport.h"
diff --git a/src/mongo/s/client/version_manager.cpp b/src/mongo/s/client/version_manager.cpp
index 5fcb8743740..c0df531ec9f 100644
--- a/src/mongo/s/client/version_manager.cpp
+++ b/src/mongo/s/client/version_manager.cpp
@@ -294,13 +294,19 @@ bool checkShardVersion(OperationContext* txn,
const ChunkVersion refVersion(refManager->getVersion(shard->getId()));
const ChunkVersion currentVersion(manager->getVersion(shard->getId()));
- string msg(str::stream()
- << "manager (" << currentVersion.toString() << " : "
- << manager->getSequenceNumber() << ") "
- << "not compatible with reference manager (" << refVersion.toString()
- << " : " << refManager->getSequenceNumber() << ") "
- << "on shard " << shard->getId() << " (" << shard->getConnString().toString()
- << ")");
+ string msg(str::stream() << "manager (" << currentVersion.toString() << " : "
+ << manager->getSequenceNumber()
+ << ") "
+ << "not compatible with reference manager ("
+ << refVersion.toString()
+ << " : "
+ << refManager->getSequenceNumber()
+ << ") "
+ << "on shard "
+ << shard->getId()
+ << " ("
+ << shard->getConnString().toString()
+ << ")");
throw SendStaleConfigException(ns, msg, refVersion, currentVersion);
}
@@ -309,9 +315,13 @@ bool checkShardVersion(OperationContext* txn,
<< ((manager.get() == 0) ? string("<none>") : str::stream()
<< manager->getSequenceNumber())
<< ") but has reference manager ("
- << refManager->getSequenceNumber() << ") "
- << "on conn " << conn->getServerAddress() << " ("
- << conn_in->getServerAddress() << ")");
+ << refManager->getSequenceNumber()
+ << ") "
+ << "on conn "
+ << conn->getServerAddress()
+ << " ("
+ << conn_in->getServerAddress()
+ << ")");
throw SendStaleConfigException(
ns, msg, refManager->getVersion(shard->getId()), ChunkVersion::UNSHARDED());
View Lorry Controller Status