summaryrefslogtreecommitdiff
path: root/src/mongo/s/client/version_manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/s/client/version_manager.cpp')
-rw-r--r--src/mongo/s/client/version_manager.cpp30
1 files changed, 20 insertions, 10 deletions
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());