SERVER-34214 TypedCommand _flushRoutingTableCacheUpdates (fixes 052bc57)

2 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp b/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp
index b006e9a27e3..0f2bfae200b 100644
--- a/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp
+++ b/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp
@@ -88,7 +88,7 @@ public:
         }
 
         NamespaceString ns() const override {
-            return request().getNamespace();
+            return request().getCommandParameter();
         }
 
         void doCheckAuthorization(OperationContext* opCtx) const override {
@@ -116,10 +116,11 @@ public:
             {
                 AutoGetCollection autoColl(opCtx, ns(), MODE_IS);
 
-                // If the primary is in the critical section, secondaries must wait for the commit to
-                // finish on the primary in case a secondary's caller has an afterClusterTime inclusive
-                // of the commit (and new writes to the committed chunk) that hasn't yet propagated back
-                // to this shard. This ensures the read your own writes causal consistency guarantee.
+                // If the primary is in the critical section, secondaries must wait for the commit
+                // to finish on the primary in case a secondary's caller has an afterClusterTime
+                // inclusive of the commit (and new writes to the committed chunk) that hasn't yet
+                // propagated back to this shard. This ensures the read your own writes causal
+                // consistency guarantee.
                 auto const css = CollectionShardingState::get(opCtx, ns());
                 auto criticalSectionSignal =
                     css->getCriticalSectionSignal(ShardingMigrationCriticalSection::kRead);
diff --git a/src/mongo/s/request_types/flush_routing_table_cache_updates.idl b/src/mongo/s/request_types/flush_routing_table_cache_updates.idl
index f7be2e02864..d7672b6ae90 100644
--- a/src/mongo/s/request_types/flush_routing_table_cache_updates.idl
+++ b/src/mongo/s/request_types/flush_routing_table_cache_updates.idl
@@ -36,7 +36,8 @@ commands:
     _flushRoutingTableCacheUpdates:
         description: "An internal command to wait for the last routing table cache refresh for a particular namespace to be persisted to disk"
         strict: true
-        namespace: concatenate_with_db
+        namespace: type
+        type: namespacestring
         fields:
             syncFromConfig:
                 type: bool