rollback certain create collection cases

2 files changed, 33 insertions, 4 deletions

diff --git a/db/repl/rs_rollback.cpp b/db/repl/rs_rollback.cpp
index 6309f275508..e9d8ed1945d 100644
--- a/db/repl/rs_rollback.cpp
+++ b/db/repl/rs_rollback.cpp
@@ -250,9 +250,9 @@ namespace mongo {
 
        sethbmsg("syncRollback 3.5");
        if( h.rbid != getRBID(r.conn()) ) { 
-	 // our source rolled back itself.  so the data we received isn't necessarily consistent.
-	   sethbmsg("syncRollback rbid on source changed during rollback, cancelling this attempt");
-	   return;
+           // our source rolled back itself.  so the data we received isn't necessarily consistent.
+           sethbmsg("syncRollback rbid on source changed during rollback, cancelling this attempt");
+           return;
        }
 
        // update them
@@ -267,7 +267,7 @@ namespace mongo {
        dbMutex.assertWriteLocked();
 
        /* we have items we are writing that aren't from a point-in-time.  thus best not to come online 
-	  until we get to that point in freshness. */
+	      until we get to that point in freshness. */
        try {
            log() << "replSet set minvalid=" << newMinValid["ts"]._opTime().toString() << rsLog;
        }
@@ -338,6 +338,28 @@ namespace mongo {
                                log() << "replSet error rollback delete failed ns:" << d.ns << rsLog;
                            }
                        }
+                       // did we just empty the collection?  if so let's check if it even exists on the source.
+                       if( nsd->nrecords == 0 ) {
+                           try { 
+                               string sys = cc().database()->name + ".system.namespaces";
+                               bo o = them->findOne(sys, QUERY("name"<<d.ns));
+                               if( o.isEmpty() ) { 
+                                   // we should drop
+                                   try {
+                                       bob res;
+                                       string errmsg;
+                                       dropCollection(d.ns, errmsg, res);
+                                   }
+                                   catch(...) { 
+                                       log() << "replset error rolling back collection " << d.ns << rsLog;
+                                   }
+                               }
+                           }
+                           catch(DBException& ) { 
+                               /* this isn't *that* big a deal, but is bad. */
+                               log() << "replSet warning rollback error querying for existence of " << d.ns << " at the primary, ignoring" << rsLog;
+                           }
+                       }
                    }
                }
                else {
diff --git a/jstests/replsets/rollback2.js b/jstests/replsets/rollback2.js
index 5aee54b8cc4..5817208854e 100644
--- a/jstests/replsets/rollback2.js
+++ b/jstests/replsets/rollback2.js
@@ -92,6 +92,13 @@ function doItemsToRollBack(db) {
 

     db.kap.insert({ foo: 2 })

     db.kap2.insert({ foo: 2 })

+

+    // create a collection (need to roll back the whole thing)

+    db.newcoll.insert({ a: true });

+

+    // create a new empty collection (need to roll back the whole thing)

+    // TODO NOT DONE

+    // db.createCollection("abc");

 }

 

 function doWritesToKeep2(db) {