handle oplog case where mixed working set may require much oplog scanning SERVER-649

Conflicts:

	db/namespace.cpp

1 files changed, 5 insertions, 4 deletions

diff --git a/db/namespace.cpp b/db/namespace.cpp
index 7ae46a348e1..dc8f13ee93f 100644
--- a/db/namespace.cpp
+++ b/db/namespace.cpp
@@ -445,9 +445,10 @@ namespace mongo {
         // signal done allocating new extents.
         if ( !deletedList[ 1 ].isValid() )
             deletedList[ 1 ] = DiskLoc();
-
+        
         assert( len < 400000000 );
         int passes = 0;
+        const int maxPasses = len / 30; // 30 is about the smallest entry that could go in the oplog
         DiskLoc loc;
 
         // delete records until we have room and the max # objects limit achieved.
@@ -496,10 +497,10 @@ namespace mongo {
             DiskLoc fr = theCapExtent()->firstRecord;
             theDataFileMgr.deleteRecord(ns, fr.rec(), fr, true);
             compact();
-            if( ++passes >= 5000 ) {
-                log() << "passes ns:" << ns << " len:" << len << '\n';
+            if( ++passes >= maxPasses ) {
+                log() << "passes ns:" << ns << " len:" << len << " maxPasses: " << maxPasses << '\n';
                 log() << "passes max:" << max << " nrecords:" << nrecords << " datasize: " << datasize << endl;
-                massert( "passes >= 5000 in capped collection alloc", false );
+                massert( "passes >= maxPasses in capped collection alloc", false );
             }
         }