helper method Client::allowedToThrowPageFaultException and some PageFault* cleaning

1 files changed, 3 insertions, 8 deletions

diff --git a/src/mongo/db/pagefault.cpp b/src/mongo/db/pagefault.cpp
index 1c8a874da29..d1f980d83d9 100644
--- a/src/mongo/db/pagefault.cpp
+++ b/src/mongo/db/pagefault.cpp
@@ -11,9 +11,8 @@ namespace mongo {
 
     PageFaultException::PageFaultException(Record *_r)
     {
-        assert( cc().inPageFaultRetryableSection() );
+        assert( cc().allowedToThrowPageFaultException() );
         cc().getPageFaultRetryableSection()->didLap();
-        assert( cc().getPageFaultRetryableSection()->laps() < 1000 );
         r = _r;
         era = LockMongoFilesShared::getEra();
     }
@@ -31,21 +30,17 @@ namespace mongo {
     }
 
     PageFaultRetryableSection::~PageFaultRetryableSection() {
-        cc()._pageFaultRetryableSection = old;
+        cc()._pageFaultRetryableSection = 0;
     }
     PageFaultRetryableSection::PageFaultRetryableSection() {
         _laps = 0;
-        old = cc()._pageFaultRetryableSection;
+        assert( cc()._pageFaultRetryableSection == 0 );
         if( d.dbMutex.atLeastReadLocked() ) { 
             cc()._pageFaultRetryableSection = 0;
             if( debug || logLevel > 2 ) { 
                 LOGSOME << "info PageFaultRetryableSection will not yield, already locked upon reaching" << endl;
             }
         }
-        else if( cc()._pageFaultRetryableSection ) { 
-            cc()._pageFaultRetryableSection = 0;
-            dlog(2) << "info nested PageFaultRetryableSection will not yield on fault" << endl;
-        }
         else {
             cc()._pageFaultRetryableSection = this;
             cc()._hasWrittenThisPass = false;