SERVER-19855 Remove 'shardName' field from write commands' metadata

It is not necessary, because it already goes over an initialized
connection, which would have performed the shard name validation.

2 files changed, 25 insertions, 1 deletions

diff --git a/src/mongo/db/s/sharding_state.cpp b/src/mongo/db/s/sharding_state.cpp
index 8865a839e5c..c4c1ca55a42 100644
--- a/src/mongo/db/s/sharding_state.cpp
+++ b/src/mongo/db/s/sharding_state.cpp
@@ -385,6 +385,14 @@ void ShardingState::mergeChunks(OperationContext* txn,
     _collMetadata[ns] = cloned;
 }
 
+bool ShardingState::inCriticalMigrateSection() {
+    return _migrationSourceManager.getInCriticalSection();
+}
+
+bool ShardingState::waitTillNotInCriticalSection(int maxSecondsToWait) {
+    return _migrationSourceManager.waitTillNotInCriticalSection(maxSecondsToWait);
+}
+
 void ShardingState::resetMetadata(const string& ns) {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
 
diff --git a/src/mongo/db/s/sharding_state.h b/src/mongo/db/s/sharding_state.h
index db006b9de1c..0f7168355d8 100644
--- a/src/mongo/db/s/sharding_state.h
+++ b/src/mongo/db/s/sharding_state.h
@@ -34,6 +34,8 @@
 
 #include "mongo/base/disallow_copying.h"
 #include "mongo/bson/oid.h"
+#include "mongo/db/s/migration_destination_manager.h"
+#include "mongo/db/s/migration_source_manager.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/util/concurrency/ticketholder.h"
@@ -75,6 +77,14 @@ public:
     std::string getConfigServer(OperationContext* txn);
     std::string getShardName();
 
+    MigrationSourceManager* migrationSourceManager() {
+        return &_migrationSourceManager;
+    }
+
+    MigrationDestinationManager* migrationDestinationManager() {
+        return &_migrationDestManager;
+    }
+
     // Initialize sharding state and begin authenticating outgoing connections and handling
     // shard versions.  If this is not run before sharded operations occur auth will not work
     // and versions will not be tracked.
@@ -299,7 +309,13 @@ private:
                              bool useRequestedVersion,
                              ChunkVersion* latestShardVersion);
 
-    // protects state below
+    // Manages the state of the migration donor shard
+    MigrationSourceManager _migrationSourceManager;
+
+    // Manages the state of the migration recipient shard
+    MigrationDestinationManager _migrationDestManager;
+
+    // Protects state below
     stdx::mutex _mutex;
 
     // Whether ::initialize has been called