set Stale shard data on late errors

guanqun · Jul 22, 2010 · 852eb9b · 852eb9b
1 parent c09bd3b
commit 852eb9b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/db/client.cpp b/db/client.cpp
@@ -196,7 +196,7 @@ namespace mongo {
         {
             string errmsg;
             if ( ! shardVersionOk( _ns , errmsg ) ){
-                msgasserted( 13388 , (string)"shard version not ok in Client::Context: " + errmsg );
+                msgasserted( StaleConfigInContextCode , (string)"shard version not ok in Client::Context: " + errmsg );
             }
         }
     }

diff --git a/db/instance.cpp b/db/instance.cpp
@@ -199,6 +199,8 @@ namespace mongo {
             b.decouple();
             QueryResult *qr = msgdata;
             qr->_resultFlags() = ResultFlag_ErrSet;
+            if ( e.getCode() == StaleConfigInContextCode )
+                qr->_resultFlags() |= ResultFlag_ShardConfigStale;
             qr->len = b.len();
             qr->setOperation(opReply);
             qr->cursorId = 0;

diff --git a/db/repl/rs_initialsync.cpp b/db/repl/rs_initialsync.cpp
@@ -34,7 +34,7 @@ namespace mongo {
         if( !expr ) { 
             string m = str::stream() << "initial sync " << msg;
             theReplSet->sethbmsg(m, 0);
-            uasserted(13388, m);
+            uasserted(13404, m);
         }
     }
 

diff --git a/s/commands_public.cpp b/s/commands_public.cpp
@@ -225,7 +225,7 @@ namespace mongo {
                         return true;
                     }
 
-                    if ( temp["code"].numberInt() != 13388 ){
+                    if ( temp["code"].numberInt() != StaleConfigInContextCode ){
                         errmsg = temp["errmsg"].String();
                         result.appendElements( temp );
                         return false;
@@ -278,7 +278,7 @@ namespace mongo {
                             continue;
                         }
 
-                        if ( 13388 == temp["code"].numberInt() ){
+                        if ( StaleConfigInContextCode == temp["code"].numberInt() ){
                             // my version is old
                             total = 0;
                             shardCounts.clear();

diff --git a/s/shard.cpp b/s/shard.cpp
@@ -224,4 +224,5 @@ namespace mongo {
     }
 
 
+    const int StaleConfigInContextCode = 13388;
 }
diff --git a/s/util.h b/s/util.h
@@ -27,6 +27,8 @@
  */
 
 namespace mongo {
+
+    extern const int StaleConfigInContextCode;
 
     struct ShardChunkVersion {
         union {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -224,4 +224,5 @@ namespace mongo {
		}


		const int StaleConfigInContextCode = 13388;
		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ @@
      */
     namespace mongo {
+        extern const int StaleConfigInContextCode;
         struct ShardChunkVersion {
             union {
@@ Expand Down @@