summaryrefslogtreecommitdiff
path: root/src/mongo/s/client/shard_connection.cpp
diff options
context:
space:
mode:
authorMatt Cotter <matt.cotter@mongodb.com>2016-12-08 11:09:02 -0500
committerMatt Cotter <matt.cotter@mongodb.com>2016-12-13 11:50:42 -0500
commit26ff349e8108d6223628428494d8da5f0c31def5 (patch)
treee3627d209ef2a7ff6008f8f09a784273804ee3df /src/mongo/s/client/shard_connection.cpp
parent59d4a5c9f80078f73f81483ac807a25256d281bb (diff)
downloadmongo-26ff349e8108d6223628428494d8da5f0c31def5.tar.gz
SERVER-27325 deduplicate symbol `usingAShardConnection`
Diffstat (limited to 'src/mongo/s/client/shard_connection.cpp')
-rw-r--r--src/mongo/s/client/shard_connection.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mongo/s/client/shard_connection.cpp b/src/mongo/s/client/shard_connection.cpp
index 7e38ed59b9e..bbe562997c1 100644
--- a/src/mongo/s/client/shard_connection.cpp
+++ b/src/mongo/s/client/shard_connection.cpp
@@ -41,7 +41,9 @@
#include "mongo/s/client/shard.h"
#include "mongo/s/client/shard_registry.h"
#include "mongo/s/client/version_manager.h"
+#include "mongo/s/cluster_last_error_info.h"
#include "mongo/s/grid.h"
+#include "mongo/s/is_mongos.h"
#include "mongo/util/concurrency/spin_lock.h"
#include "mongo/util/exit.h"
#include "mongo/util/log.h"
@@ -401,9 +403,6 @@ thread_specific_ptr<ClientConnections> ClientConnections::_perThread;
// The global connection pool
DBConnectionPool shardConnectionPool;
-// Different between mongos and mongod
-void usingAShardConnection(const string& addr);
-
ShardConnection::ShardConnection(const ConnectionString& connectionString,
const string& ns,
std::shared_ptr<ChunkManager> manager)
@@ -415,8 +414,13 @@ ShardConnection::ShardConnection(const ConnectionString& connectionString,
invariant(_manager->getns() == _ns);
}
- _conn = ClientConnections::threadInstance()->get(_cs.toString(), _ns);
- usingAShardConnection(_cs.toString());
+ auto csString = _cs.toString();
+ _conn = ClientConnections::threadInstance()->get(csString, _ns);
+ if (isMongos()) {
+ // In mongos, we record this connection as having been used for useful work to provide
+ // useful information in getLastError.
+ ClusterLastErrorInfo::get(cc()).addShardHost(csString);
+ }
}
ShardConnection::~ShardConnection() {