SERVER-12607 make [update/delete] write commands interruptable with killOp

milkie · milkie · commit e2ee0675ee7f · 2014-03-03T16:54:35.000-05:00
diff --git a/src/mongo/base/error_codes.err b/src/mongo/base/error_codes.err
@@ -84,9 +84,11 @@ error_code("NoClientContext", 81)
 error_code("NoProgressMade", 82)
 
 # Non-sequential error codes (for compatibility only)
-error_code("DuplicateKey", 11000)
 error_code("NotMaster", 10107) #this comes from assert_util.h
+error_code("DuplicateKey", 11000)
+error_code("InterruptedAtShutdown", 11600)
 error_code("Interrupted", 11601)
 error_code("OutOfDiskSpace", 14031 )
 
 error_class("NetworkError", ["HostUnreachable", "HostNotFound"])
+error_class("Interruption", ["Interrupted", "InterruptedAtShutdown", "ExceededTimeLimit"])
diff --git a/src/mongo/db/catalog/index_catalog.cpp b/src/mongo/db/catalog/index_catalog.cpp
@@ -338,7 +338,7 @@ namespace mongo {
                   << " error: " << exc;
 
             if ( shutdownBehavior == SHUTDOWN_LEAVE_DIRTY &&
-                 exc.getCode() == InterruptedAtShutdown ) {
+                 exc.getCode() == ErrorCodes::InterruptedAtShutdown ) {
                 indexBuildBlock.abort();
             }
             else {
diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp
@@ -30,6 +30,7 @@
 
 #include "mongo/db/catalog/index_create.h"
 
+#include "mongo/base/error_codes.h"
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/db/audit.h"
 #include "mongo/db/background.h"
@@ -128,7 +129,7 @@ namespace mongo {
                 }
             }
             catch( AssertionException& e ) {
-                if( e.interrupted() ) {
+                if (ErrorCodes::isInterruption(DBException::convertExceptionCode(e.getCode()))) {
                     killCurrentOp.checkForInterrupt();
                 }
 
diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -654,7 +654,6 @@ namespace mongo {
                     if ( request.getOrdered() )
                         break;
                 }
-                killCurrentOp.checkForInterrupt();
             }
         }
         else {
@@ -669,7 +668,6 @@ namespace mongo {
                     if ( request.getOrdered() )
                         break;
                 }
-                killCurrentOp.checkForInterrupt();
             }
         }
 
@@ -772,7 +770,11 @@ namespace mongo {
                         }
                     }
                     catch ( const DBException& ex ) {
-                        currResult.error = toWriteError( ex.toStatus() );
+                        Status stat(ex.toStatus());
+                        if (ErrorCodes::isInterruption(stat.code())) {
+                            throw;
+                        }
+                        currResult.error = toWriteError(stat);
                     }
 
                     //
@@ -999,7 +1001,11 @@ namespace mongo {
             result->fault = new PageFaultException( ex );
         }
         catch ( const DBException& ex ) {
-            result->error = toWriteError( ex.toStatus() );
+            Status stat(ex.toStatus());
+            if (ErrorCodes::isInterruption(stat.code())) {
+                throw;
+            }
+            result->error = toWriteError(stat);
         }
 
     }
@@ -1039,7 +1045,11 @@ namespace mongo {
             result->fault = new PageFaultException( ex );
         }
         catch ( const DBException& ex ) {
-            result->error = toWriteError( ex.toStatus() );
+            Status stat(ex.toStatus());
+            if (ErrorCodes::isInterruption(stat.code())) {
+                throw;
+            }
+            result->error = toWriteError(stat);
         }
     }
 
@@ -1089,7 +1099,11 @@ namespace mongo {
             result->stats.upsertedID = resUpsertedID;
         }
         catch (const DBException& ex) {
-            result->error = toWriteError(ex.toStatus());
+            Status stat(ex.toStatus());
+            if (ErrorCodes::isInterruption(stat.code())) {
+                throw;
+            }
+            result->error = toWriteError(stat);
         }
     }
 
@@ -1119,7 +1133,11 @@ namespace mongo {
             result->fault = new PageFaultException( ex );
         }
         catch ( const DBException& ex ) {
-            result->error = toWriteError( ex.toStatus() );
+            Status stat(ex.toStatus());
+            if (ErrorCodes::isInterruption(stat.code())) {
+                throw;
+            }
+            result->error = toWriteError(stat);
         }
     }
 
diff --git a/src/mongo/db/index/btree_based_access_method.cpp b/src/mongo/db/index/btree_based_access_method.cpp
@@ -30,6 +30,7 @@
 
 #include <vector>
 
+#include "mongo/base/error_codes.h"
 #include "mongo/base/status.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/extsort.h"
@@ -419,7 +420,8 @@ namespace mongo {
                         throw;
                     }
 
-                    if( e.interrupted() ) {
+                    if (ErrorCodes::isInterruption(
+                            DBException::convertExceptionCode(e.getCode()))) {
                         killCurrentOp.checkForInterrupt();
                     }
 
diff --git a/src/mongo/db/kill_current_op.cpp b/src/mongo/db/kill_current_op.cpp
@@ -170,7 +170,7 @@ namespace {
             return;
         }
 
-        uassert(InterruptedAtShutdown, "interrupted at shutdown", !_globalKill);
+        uassert(ErrorCodes::InterruptedAtShutdown, "interrupted at shutdown", !_globalKill);
 
         if (c.curop()->maxTimeHasExpired()) {
             c.curop()->kill();
diff --git a/src/mongo/util/assert_util.h b/src/mongo/util/assert_util.h
@@ -31,7 +31,6 @@ namespace mongo {
     enum CommonErrorCodes {
         OkCode = 0,
         DatabaseDifferCaseCode = 13297 ,  // uassert( 13297 )
-        InterruptedAtShutdown = 11600 ,   // uassert( 11600 )
         SendStaleConfigCode = 13388 ,     // uassert( 13388 )
         RecvStaleConfigCode = 9996,       // uassert( 9996 )
         PrepareConfigsFailedCode = 13104, // uassert( 13104 )
@@ -144,12 +143,6 @@ namespace mongo {
 
         virtual bool severe() const { return true; }
         virtual bool isUserAssertion() const { return false; }
-
-        /* true if an interrupted exception - see KillCurrentOp */
-        bool interrupted() {
-            return _ei.code == InterruptedAtShutdown || _ei.code == 11601 ||
-                   _ei.code == ErrorCodes::ExceededTimeLimit;
-        }
     };
 
     /* UserExceptions are valid errors that a user can cause, like out of disk space or duplicate key */

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ namespace mongo {`
`338`	`338`	`<< " error: " << exc;`
`339`	`339`
`340`	`340`	`if ( shutdownBehavior == SHUTDOWN_LEAVE_DIRTY &&`
`341`		`- exc.getCode() == InterruptedAtShutdown ) {`
	`341`	`+ exc.getCode() == ErrorCodes::InterruptedAtShutdown ) {`
`342`	`342`	`indexBuildBlock.abort();`
`343`	`343`	`}`
`344`	`344`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`
`31`	`31`	`#include "mongo/db/catalog/index_create.h"`
`32`	`32`
	`33`	`+#include "mongo/base/error_codes.h"`
`33`	`34`	`#include "mongo/client/dbclientinterface.h"`
`34`	`35`	`#include "mongo/db/audit.h"`
`35`	`36`	`#include "mongo/db/background.h"`
`@@ -128,7 +129,7 @@ namespace mongo {`
`128`	`129`	`}`
`129`	`130`	`}`
`130`	`131`	`catch( AssertionException& e ) {`
`131`		`- if( e.interrupted() ) {`
	`132`	`+ if (ErrorCodes::isInterruption(DBException::convertExceptionCode(e.getCode()))) {`
`132`	`133`	`killCurrentOp.checkForInterrupt();`
`133`	`134`	`}`
`134`	`135`
Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,6 @@ namespace mongo {`
`654`	`654`	`if ( request.getOrdered() )`
`655`	`655`	`break;`
`656`	`656`	`}`
`657`		`- killCurrentOp.checkForInterrupt();`
`658`	`657`	`}`
`659`	`658`	`}`
`660`	`659`	`else {`
`@@ -669,7 +668,6 @@ namespace mongo {`
`669`	`668`	`if ( request.getOrdered() )`
`670`	`669`	`break;`
`671`	`670`	`}`
`672`		`- killCurrentOp.checkForInterrupt();`
`673`	`671`	`}`
`674`	`672`	`}`
`675`	`673`
`@@ -772,7 +770,11 @@ namespace mongo {`
`772`	`770`	`}`
`773`	`771`	`}`
`774`	`772`	`catch ( const DBException& ex ) {`
`775`		`- currResult.error = toWriteError( ex.toStatus() );`
	`773`	`+ Status stat(ex.toStatus());`
	`774`	`+ if (ErrorCodes::isInterruption(stat.code())) {`
	`775`	`+ throw;`
	`776`	`+ }`
	`777`	`+ currResult.error = toWriteError(stat);`
`776`	`778`	`}`
`777`	`779`
`778`	`780`	`//`
`@@ -999,7 +1001,11 @@ namespace mongo {`
`999`	`1001`	`result->fault = new PageFaultException( ex );`
`1000`	`1002`	`}`
`1001`	`1003`	`catch ( const DBException& ex ) {`
`1002`		`- result->error = toWriteError( ex.toStatus() );`
	`1004`	`+ Status stat(ex.toStatus());`
	`1005`	`+ if (ErrorCodes::isInterruption(stat.code())) {`
	`1006`	`+ throw;`
	`1007`	`+ }`
	`1008`	`+ result->error = toWriteError(stat);`
`1003`	`1009`	`}`
`1004`	`1010`
`1005`	`1011`	`}`
`@@ -1039,7 +1045,11 @@ namespace mongo {`
`1039`	`1045`	`result->fault = new PageFaultException( ex );`
`1040`	`1046`	`}`
`1041`	`1047`	`catch ( const DBException& ex ) {`
`1042`		`- result->error = toWriteError( ex.toStatus() );`
	`1048`	`+ Status stat(ex.toStatus());`
	`1049`	`+ if (ErrorCodes::isInterruption(stat.code())) {`
	`1050`	`+ throw;`
	`1051`	`+ }`
	`1052`	`+ result->error = toWriteError(stat);`
`1043`	`1053`	`}`
`1044`	`1054`	`}`
`1045`	`1055`
`@@ -1089,7 +1099,11 @@ namespace mongo {`
`1089`	`1099`	`result->stats.upsertedID = resUpsertedID;`
`1090`	`1100`	`}`
`1091`	`1101`	`catch (const DBException& ex) {`
`1092`		`- result->error = toWriteError(ex.toStatus());`
	`1102`	`+ Status stat(ex.toStatus());`
	`1103`	`+ if (ErrorCodes::isInterruption(stat.code())) {`
	`1104`	`+ throw;`
	`1105`	`+ }`
	`1106`	`+ result->error = toWriteError(stat);`
`1093`	`1107`	`}`
`1094`	`1108`	`}`
`1095`	`1109`
`@@ -1119,7 +1133,11 @@ namespace mongo {`
`1119`	`1133`	`result->fault = new PageFaultException( ex );`
`1120`	`1134`	`}`
`1121`	`1135`	`catch ( const DBException& ex ) {`
`1122`		`- result->error = toWriteError( ex.toStatus() );`
	`1136`	`+ Status stat(ex.toStatus());`
	`1137`	`+ if (ErrorCodes::isInterruption(stat.code())) {`
	`1138`	`+ throw;`
	`1139`	`+ }`
	`1140`	`+ result->error = toWriteError(stat);`
`1123`	`1141`	`}`
`1124`	`1142`	`}`
`1125`	`1143`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ namespace {`
`170`	`170`	`return;`
`171`	`171`	`}`
`172`	`172`
`173`		`- uassert(InterruptedAtShutdown, "interrupted at shutdown", !_globalKill);`
	`173`	`+ uassert(ErrorCodes::InterruptedAtShutdown, "interrupted at shutdown", !_globalKill);`
`174`	`174`
`175`	`175`	`if (c.curop()->maxTimeHasExpired()) {`
`176`	`176`	`c.curop()->kill();`