SERVER-31952 Return error if collMod provides a UUID that does not match the UUID of the collection specified

(cherry picked from commit de7324dc370bc2a0c8367bbf0ce97314bce2802a)

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/coll_mod.cpp b/src/mongo/db/catalog/coll_mod.cpp
index b6c6c61d374..f839c9cc361 100644
--- a/src/mongo/db/catalog/coll_mod.cpp
+++ b/src/mongo/db/catalog/coll_mod.cpp
@@ -441,6 +441,14 @@ Status _collModInternal(OperationContext* opCtx,
                   << coll->ns();
             CollectionCatalogEntry* cce = coll->getCatalogEntry();
             cce->removeUUID(opCtx);
+        } else if (uuid && coll->uuid() && uuid.get() != coll->uuid().get()) {
+            return Status(ErrorCodes::Error(50658),
+                          str::stream() << "collMod " << redact(cmdObj) << " provides a UUID ("
+                                        << uuid.get().toString()
+                                        << ") that does not match the UUID ("
+                                        << coll->uuid().get().toString()
+                                        << ") of the collection "
+                                        << nss.ns());
         }
         coll->refreshUUID(opCtx);
     }