summaryrefslogtreecommitdiff
path: root/src/mongo/db/ops
diff options
context:
space:
mode:
authorSiyuan Zhou <siyuan.zhou@mongodb.com>2016-08-16 12:05:35 -0400
committerSiyuan Zhou <siyuan.zhou@mongodb.com>2016-08-25 13:34:16 -0400
commit6b571fa314a9c5d193d362570bb58064d1d1fb0f (patch)
tree65fe8ecb710be879db8109bc3f92e4718efafdba /src/mongo/db/ops
parent3eaf36bc9fb28f9ca63b0d7de33e9f587aa88325 (diff)
downloadmongo-6b571fa314a9c5d193d362570bb58064d1d1fb0f.tar.gz
SERVER-25126 Return a different error code if the step down occurs after the write
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r--src/mongo/db/ops/update.cpp2
-rw-r--r--src/mongo/db/ops/write_ops_exec.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
index c808d9aab34..5e0763f9eac 100644
--- a/src/mongo/db/ops/update.cpp
+++ b/src/mongo/db/ops/update.cpp
@@ -94,7 +94,7 @@ UpdateResult update(OperationContext* txn, Database* db, const UpdateRequest& re
!repl::getGlobalReplicationCoordinator()->canAcceptWritesFor(nsString);
if (userInitiatedWritesAndNotPrimary) {
- uassertStatusOK(Status(ErrorCodes::NotMaster,
+ uassertStatusOK(Status(ErrorCodes::PrimarySteppedDown,
str::stream() << "Not primary while creating collection "
<< nsString.ns()
<< " during upsert"));
diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp
index 95b73b51873..52db4a5674a 100644
--- a/src/mongo/db/ops/write_ops_exec.cpp
+++ b/src/mongo/db/ops/write_ops_exec.cpp
@@ -167,7 +167,7 @@ private:
};
void assertCanWrite_inlock(OperationContext* txn, const NamespaceString& ns) {
- uassert(ErrorCodes::NotMaster,
+ uassert(ErrorCodes::PrimarySteppedDown,
str::stream() << "Not primary while writing to " << ns.ns(),
repl::ReplicationCoordinator::get(txn->getServiceContext())->canAcceptWritesFor(ns));
CollectionShardingState::get(txn, ns)->checkShardVersionOrThrow(txn);