SERVER-18664 make commands always return {ok: 0.0, errmsg: ..., code: ...} style responses

1 files changed, 22 insertions, 1 deletions

diff --git a/src/mongo/db/commands.h b/src/mongo/db/commands.h
index 01cbcf9fc9f..f35e3f77dc5 100644
--- a/src/mongo/db/commands.h
+++ b/src/mongo/db/commands.h
@@ -333,6 +333,27 @@ namespace mutablebson {
         // Set by command line.  Controls whether or not testing-only commands should be available.
         static int testCommandsEnabled;
 
+        /**
+         * When an assertion is hit during command execution, this method is used to fill the fields
+         * of the command reply with the information from the error. In addition, information about
+         * the command is logged. This function does not return anything, because there is typically
+         * already an active exception when this function is called, so there
+         * is little that can be done if it fails.
+         */
+        static void generateErrorResponse(OperationContext* txn,
+                                          rpc::ReplyBuilderInterface* replyBuilder,
+                                          const DBException& exception,
+                                          const rpc::RequestInterface& request);
+
+        /**
+         * Similar to other overloads of generateErrorResponse, but doesn't print any information
+         * about the specific command being executed. This is neccessary, for example, if there is
+         * an assertion hit while parsing the command.
+         */
+        static void generateErrorResponse(OperationContext* txn,
+                                          rpc::ReplyBuilderInterface* replyBuilder,
+                                          const DBException& exception);
+
     private:
 
         /**
@@ -349,7 +370,7 @@ namespace mutablebson {
                                           const BSONObj& cmdObj);
     };
 
-    bool runCommands(OperationContext* txn,
+    void runCommands(OperationContext* txn,
                      const rpc::RequestInterface& request,
                      rpc::ReplyBuilderInterface* replyBuilder);