summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/catalog_control.cpp
diff options
context:
space:
mode:
authorDianna Hohensee <dianna.hohensee@10gen.com>2018-02-20 17:26:45 -0500
committerDianna Hohensee <dianna.hohensee@10gen.com>2018-02-23 16:56:20 -0500
commitde6ceb82f5b554f16517295adfd39c8bfd407926 (patch)
tree398687bf08c09379e46d38e2f00f17b2352b2fb4 /src/mongo/db/catalog/catalog_control.cpp
parentfd83ef4e9069e4dee7149b3dc589be66590a520f (diff)
downloadmongo-de6ceb82f5b554f16517295adfd39c8bfd407926.tar.gz
SERVER-33179 Remove featureCompatibilityVersion 3.4
Diffstat (limited to 'src/mongo/db/catalog/catalog_control.cpp')
-rw-r--r--src/mongo/db/catalog/catalog_control.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mongo/db/catalog/catalog_control.cpp b/src/mongo/db/catalog/catalog_control.cpp
index fad8950aed0..7a8ccfdb0b1 100644
--- a/src/mongo/db/catalog/catalog_control.cpp
+++ b/src/mongo/db/catalog/catalog_control.cpp
@@ -152,13 +152,11 @@ void openCatalog(OperationContext* opCtx) {
<< collName);
auto uuid = collection->uuid();
- // TODO (SERVER-32597): When the minimum featureCompatibilityVersion becomes 3.6, we
- // can change this condition to be an invariant.
- if (uuid) {
- LOG(1) << "openCatalog: registering uuid " << uuid->toString() << " for collection "
- << collName;
- uuidCatalog.registerUUIDCatalogEntry(*uuid, collection);
- }
+ invariant(uuid);
+
+ LOG(1) << "openCatalog: registering uuid " << uuid->toString() << " for collection "
+ << collName;
+ uuidCatalog.registerUUIDCatalogEntry(*uuid, collection);
// If this is the oplog collection, re-establish the replication system's cached pointer
// to the oplog.