Add new form of fassert that takes a Status instead of a bool.

2 files changed, 14 insertions, 0 deletions

diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
index 45fa0f2c8ad..8e220c019e9 100644
--- a/src/mongo/util/assert_util.cpp
+++ b/src/mongo/util/assert_util.cpp
@@ -140,6 +140,14 @@ namespace mongo {
         ::_exit(EXIT_ABRUPT); // bypass our handler for SIGABRT, which prints a stack trace.
     }
 
+    MONGO_COMPILER_NORETURN void fassertFailedWithStatus(int msgid, const Status& status) {
+        problem() << "Fatal assertion " <<  msgid << " " << status;
+        logContext();
+        breakpoint();
+        log() << "\n\n***aborting after fassert() failure\n\n" << endl;
+        abort();
+    }
+
     void uasserted(int msgid , const string &msg) {
         uasserted(msgid, msg.c_str());
     }
diff --git a/src/mongo/util/assert_util.h b/src/mongo/util/assert_util.h
index 8ea5f356846..5aa6c3f7291 100644
--- a/src/mongo/util/assert_util.h
+++ b/src/mongo/util/assert_util.h
@@ -168,6 +168,7 @@ namespace mongo {
     void wasserted(const char *msg, const char *file, unsigned line);
     MONGO_COMPILER_NORETURN void fassertFailed( int msgid );
     MONGO_COMPILER_NORETURN void fassertFailedNoTrace( int msgid );
+    MONGO_COMPILER_NORETURN void fassertFailedWithStatus(int msgid, const Status& status);
     
     /** a "user assertion".  throws UserAssertion.  logs.  typically used for errors that a user
         could cause, such as duplicate key, disk full, etc.
@@ -197,6 +198,11 @@ namespace mongo {
 
     /** aborts on condition failure */
     inline void fassert(int msgid, bool testOK) {if (MONGO_unlikely(!testOK)) fassertFailed(msgid);}
+    inline void fassert(int msgid, const Status& status) {
+        if (MONGO_unlikely(!status.isOK())) {
+            fassertFailedWithStatus(msgid, status);
+        }
+    }
 
 
     /* "user assert".  if asserts, user did something wrong, not our code */