putting all PageFaultException lap logic in 1 place (Client::allowedT…

…oThrowPageFaultException)
peterpay · Apr 2, 2012 · 93a0a78 · 93a0a78
1 parent 2a5a7f9
commit 93a0a78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
@@ -584,7 +584,7 @@ namespace mongo {
         return 
             _hasWrittenThisPass == false && 
             _pageFaultRetryableSection != 0 && 
-            _pageFaultRetryableSection->laps() < 1000; 
+            _pageFaultRetryableSection->laps() < 100; 
     }
 
     void OpDebug::reset() {

diff --git a/src/mongo/db/pagefault.cpp b/src/mongo/db/pagefault.cpp
@@ -15,7 +15,7 @@ namespace mongo {
         cc().getPageFaultRetryableSection()->didLap();
         r = _r;
         era = LockMongoFilesShared::getEra();
-        log(2) << "PageFaultException thrown" << endl;
+        LOG(2) << "PageFaultException thrown" << endl;
     }
 
     void PageFaultException::touch() { 

diff --git a/src/mongo/db/record.cpp b/src/mongo/db/record.cpp
@@ -252,12 +252,7 @@ namespace mongo {
 
     void Record::_accessing() const {
         if ( cc().allowedToThrowPageFaultException() && ! likelyInPhysicalMemory() ) {
-            if( cc().getPageFaultRetryableSection()->laps() > 100 ) { 
-                log() << "info pagefaultexception _laps > 100" << endl;
-            }
-            else {
-                throw PageFaultException(this);
-            }
+            throw PageFaultException(this);
         }
     }