summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuhong Zhang <danielzhangyh@gmail.com>2021-10-12 16:06:55 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-10-19 18:06:46 +0000
commitd1c187be228c7dab44b00f3665a83c8d1e834e9f (patch)
tree21aed67081697327ea158459c8908e8ae97eeb52
parentee770884c22830f4c7881eefecbf55f00594d6fe (diff)
downloadmongo-d1c187be228c7dab44b00f3665a83c8d1e834e9f.tar.gz
SERVER-60606 Abort index builds conflicting with emptycapped during initial sync
(cherry picked from commit a4ad66c348822a19bbad38fb8485edd884b89a1a)
-rw-r--r--src/mongo/db/repl/oplog.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 5b2ae9cfea5..6cd1a8cc6b3 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -171,6 +171,7 @@ void abortTwoPhaseIndexBuilds(OperationContext* opCtx,
} else if (commandType == OplogEntry::CommandType::kDrop ||
commandType == OplogEntry::CommandType::kDropIndexes ||
commandType == OplogEntry::CommandType::kCollMod ||
+ commandType == OplogEntry::CommandType::kEmptyCapped ||
commandType == OplogEntry::CommandType::kRenameCollection) {
const boost::optional<UUID> collUUID =
CollectionCatalog::get(opCtx).lookupUUIDByNSS(opCtx, nss);