diff options
| author | Mathias Stearn <mathias@10gen.com> | 2018-04-24 16:58:23 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2018-05-08 14:57:37 -0400 |
| commit | 589af3820b00ed0b7ac26a84cfeed6554ab191f3 (patch) | |
| tree | bb393adad8b1ca4f6f0e23c035141e829e3eeee6 /src/mongo/db/commands/do_txn_cmd.cpp | |
| parent | 98f28d452b9b330d6c1696d6d8207b582a5870fc (diff) | |
| download | mongo-589af3820b00ed0b7ac26a84cfeed6554ab191f3.tar.gz | |
SERVER-34628 Prep for removing appendCommandStatus
* Added appendCommandStatusNoThrow matching the current aCS behavior
* Make appendCommandStatus call uassertStatusOK then aCS on success
* Make the few places that need to not throw call aCSNT
A following commit will completely remove appendCommandStatus. It is split out
because that commit is fairly huge.
Diffstat (limited to 'src/mongo/db/commands/do_txn_cmd.cpp')
| -rw-r--r-- | src/mongo/db/commands/do_txn_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/do_txn_cmd.cpp b/src/mongo/db/commands/do_txn_cmd.cpp index d0dd99ec645..15183f8524c 100644 --- a/src/mongo/db/commands/do_txn_cmd.cpp +++ b/src/mongo/db/commands/do_txn_cmd.cpp @@ -159,8 +159,8 @@ public: // was acknowledged. To fix this, we should wait for replication of the node’s last applied // OpTime if the last write operation was a no-op write. - auto doTxnStatus = - CommandHelpers::appendCommandStatus(result, doTxn(opCtx, dbname, cmdObj, &result)); + auto doTxnStatus = CommandHelpers::appendCommandStatusNoThrow( + result, doTxn(opCtx, dbname, cmdObj, &result)); return doTxnStatus; } |