SERVER-29276 rolls back drop pending collections

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mongo/db/repl/rs_rollback.h b/src/mongo/db/repl/rs_rollback.h
index 0cddcd1d92c..7fa272dc22e 100644
--- a/src/mongo/db/repl/rs_rollback.h
+++ b/src/mongo/db/repl/rs_rollback.h
@@ -34,6 +34,7 @@
 #include "mongo/db/repl/optime.h"
 #include "mongo/stdx/functional.h"
 #include "mongo/util/time_support.h"
+#include "mongo/util/uuid.h"
 
 /**
  * This rollback algorithm requires featureCompatibilityVersion 3.6.
@@ -243,6 +244,12 @@ struct FixUpInfo {
     std::set<std::string> collectionsToResyncData;
     std::set<std::string> collectionsToResyncMetadata;
 
+    // When collections are dropped, they are added to a list of drop-pending collections. We keep
+    // the OpTime and the namespace of the collection because the DropPendingCollectionReaper
+    // does not store the original name or UUID of the collection.
+    stdx::unordered_map<UUID, std::pair<OpTime, std::string>, UUID::Hash>
+        collectionsToRollBackPendingDrop;
+
     OpTime commonPoint;
     RecordId commonPointOurDiskloc;