SERVER-485 fix validate on capped collection

mongodb · Dec 30, 2009 · 9f20ce7 · 9f20ce7
1 parent b88f54e
commit 9f20ce7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/db/dbcommands_admin.cpp b/db/dbcommands_admin.cpp
@@ -190,6 +190,13 @@ namespace mongo {
                             ndel++;
 
                             if ( loc.questionable() ) {
+                                if( d->capped && !loc.isValid() && i == 1 ) { 
+                                    /* [dm] the constructor for NamespaceDetails intentionally sets deletedList[1] to invalid -- presumably as 
+                                       a defensive measure? (can't remember).  So we allow it here.
+                                    */
+                                    break;
+                                }
+
                                 if ( loc.a() <= 0 || strstr(ns, "hudsonSmall") == 0 ) {
                                     ss << "    ?bad deleted loc: " << loc.toString() << " bucket:" << i << " k:" << k << endl;
                                     valid = false;

diff --git a/jstests/capped1.js b/jstests/capped1.js
@@ -4,7 +4,7 @@ t.drop();
 
 db.createCollection("capped1" , {capped:true, size:1024 }); 
 v = t.validate();
-//assert( v.valid , "A : " + tojson( v ) ); // SERVER-485
+assert( v.valid , "A : " + tojson( v ) ); // SERVER-485
 
 t.save( { x : 1 } )
 assert( t.validate().valid , "B" )