Merge branch 'master' of github.com:mongodb/mongo

3 files changed, 15 insertions, 1 deletions

diff --git a/db/instance.cpp b/db/instance.cpp
index 70bed7269ef..ab18d21f4af 100644
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -509,7 +509,10 @@ namespace mongo {
                 exhaust = false;
                 massert(13073, "shutting down", !inShutdown() );
                 pass++;
-                sleepmillis(2);
+                DEV 
+                    sleepmillis(20);
+                else 
+                    sleepmillis(2);
                 continue;
             }
             catch ( AssertionException& e ) {
diff --git a/db/oplogreader.h b/db/oplogreader.h
index 01c2928b459..6c96d0d2516 100644
--- a/db/oplogreader.h
+++ b/db/oplogreader.h
@@ -16,10 +16,19 @@ namespace mongo {
         auto_ptr<DBClientCursor> cursor;
     public:
 
+        OplogReader() { 
+            DEV log() << "TEMP *** OplogReader()" << endl;
+        }
+        ~OplogReader() { 
+            DEV log() << "TEMP *** ~OplogReader()" << endl;
+        }
+
         void resetCursor() {
+            DEV log() << "TEMP *** OplogReader::resetCursor" << endl;
             cursor.reset();
         }
         void resetConnection() {
+            DEV log() << "TEMP *** OplogReader::resetConnection" << endl;
             cursor.reset();
             _conn.reset();
         }
diff --git a/db/query.cpp b/db/query.cpp
index 0740e57dffa..2a28b7d41e9 100644
--- a/db/query.cpp
+++ b/db/query.cpp
@@ -271,6 +271,7 @@ namespace mongo {
     }
 
     QueryResult* processGetMore(const char *ns, int ntoreturn, long long cursorid , CurOp& curop, int pass, bool& exhaust ) {
+//        log() << "TEMP GETMORE " << ns << ' ' << cursorid << ' ' << pass << endl;
         exhaust = false;
         ClientCursor::Pointer p(cursorid);
         ClientCursor *cc = p._c;
@@ -312,6 +313,7 @@ namespace mongo {
 
             while ( 1 ) {
                 if ( !c->ok() ) {
+//                    log() << "TEMP Tailable : " << c->tailable() << ' ' << (queryOptions & QueryOption_AwaitData) << endl;
                     if ( c->tailable() ) {
                         /* when a tailable cursor hits "EOF", ok() goes false, and current() is null.  however 
                            advance() can still be retries as a reactivation attempt.  when there is new data, it will