fix yield with disk issue in update.cpp SERVER-3633

2 files changed, 9 insertions, 1 deletions

diff --git a/db/ops/update.cpp b/db/ops/update.cpp
index fb2b4d5695b..fd9798a8f26 100644
--- a/db/ops/update.cpp
+++ b/db/ops/update.cpp
@@ -1002,7 +1002,12 @@ namespace mongo {
             
             {
                 // we need to re-find in case something changed
-                
+                d = nsdetails( ns );
+                if ( ! d ) {
+                    // dropped 
+                    return UpdateResult(0, 0, 0);
+                }
+                nsdt = &NamespaceDetailsTransient::get_w(ns);
                 IndexDetails& i = d->idx(idIdxNo);
                 BSONObj key = i.getKeyFromQuery( patternOrig );            
                 loc = i.idxInterface().findSingle(i, i.head, key);
diff --git a/db/record.cpp b/db/record.cpp
index 18be9c75fe2..51dc52072dd 100644
--- a/db/record.cpp
+++ b/db/record.cpp
@@ -190,6 +190,9 @@ namespace mongo {
             char * end = data + netLength();
             for ( ; addr <= end ; addr += 2048 ) {
                 __record_touch_dummy += addr[0];
+
+                break; // TODO: remove this, pending SERVER-3711
+                
                 if ( ! entireRecrd )
                     break;
             }