SERVER-104222 Look at latest state of unexpected collections (#35924)

pierlauro · MongoDB Bot · commit 6cbaa176e377 · 2025-05-08T11:35:18.000Z
GitOrigin-RevId: 754c8e062d9a1acb5c3093ecda1966953ae88d29
diff --git a/src/mongo/db/s/metadata_consistency_util.cpp b/src/mongo/db/s/metadata_consistency_util.cpp
@@ -100,7 +100,7 @@ MONGO_FAIL_POINT_DEFINE(simulateCatalogTopLevelMetadataInconsistency);
 long long getNumDocs(OperationContext* opCtx, const Collection* localColl) {
     // Since users are advised to delete empty misplaced collections, rely on isEmpty
     // that is safe because the implementation guards against SERVER-24266.
-    if (AutoGetCollection ac(opCtx, localColl->ns(), MODE_IS); localColl->isEmpty(opCtx)) {
+    if (AutoGetCollection ac(opCtx, localColl->ns(), MODE_IS); ac->isEmpty(opCtx)) {
         return 0;
     }
     DBDirectClient client(opCtx);

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ MONGO_FAIL_POINT_DEFINE(simulateCatalogTopLevelMetadataInconsistency);`
`100`	`100`	`long long getNumDocs(OperationContext* opCtx, const Collection* localColl) {`
`101`	`101`	`// Since users are advised to delete empty misplaced collections, rely on isEmpty`
`102`	`102`	`// that is safe because the implementation guards against SERVER-24266.`
`103`		`- if (AutoGetCollection ac(opCtx, localColl->ns(), MODE_IS); localColl->isEmpty(opCtx)) {`
	`103`	`+ if (AutoGetCollection ac(opCtx, localColl->ns(), MODE_IS); ac->isEmpty(opCtx)) {`
`104`	`104`	`return 0;`
`105`	`105`	`}`
`106`	`106`	`DBDirectClient client(opCtx);`