SERVER-42600 Implement the FCV 4.4 checkShardVersion protocol

1 files changed, 9 insertions, 8 deletions

diff --git a/src/mongo/db/db_raii.cpp b/src/mongo/db/db_raii.cpp
index c851fcfcc9c..854b02fbdf6 100644
--- a/src/mongo/db/db_raii.cpp
+++ b/src/mongo/db/db_raii.cpp
@@ -316,13 +316,13 @@ AutoGetCollectionForReadCommand::AutoGetCollectionForReadCommand(
                     _autoCollForRead.getDb() ? _autoCollForRead.getDb()->getProfilingLevel()
                                              : kDoNotChangeProfilingLevel,
                     deadline) {
-    if (!_autoCollForRead.getView()) {
-        // Perform the check early so the query planner would be able to extract the correct
-        // shard key. Also make sure that version is compatible if query planner decides to
-        // use an empty plan.
-        auto css = CollectionShardingState::get(opCtx, _autoCollForRead.getNss());
-        css->checkShardVersionOrThrow(opCtx);
-    }
+
+    // Perform the check early so the query planner would be able to extract the correct
+    // shard key. Also make sure that version is compatible if query planner decides to
+    // use an empty plan.
+    invariant(!_autoCollForRead.getView() || !_autoCollForRead.getCollection());
+    auto css = CollectionShardingState::get(opCtx, _autoCollForRead.getNss());
+    css->checkShardVersionOrThrow(opCtx, _autoCollForRead.getCollection());
 }
 
 OldClientContext::OldClientContext(OperationContext* opCtx, const std::string& ns, bool doVersion)
@@ -344,7 +344,8 @@ OldClientContext::OldClientContext(OperationContext* opCtx, const std::string& n
                 break;
             default:
                 CollectionShardingState::get(_opCtx, NamespaceString(ns))
-                    ->checkShardVersionOrThrow(_opCtx);
+                    ->checkShardVersionOrThrow(_opCtx,
+                                               _db->getCollection(opCtx, NamespaceString(ns)));
                 break;
         }
     }