diff options
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/s/client/shard_local.cpp | 10 | ||||
| -rw-r--r-- | src/mongo/s/client/shard_remote.cpp | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/mongo/s/client/shard_local.cpp b/src/mongo/s/client/shard_local.cpp index 9d7bb2af02d..9a3d2114588 100644 --- a/src/mongo/s/client/shard_local.cpp +++ b/src/mongo/s/client/shard_local.cpp @@ -49,11 +49,6 @@ namespace mongo { -namespace { -const Status kInternalErrorStatus{ErrorCodes::InternalError, - "Invalid to check for write concern error if command failed"}; -} // namespace - ShardLocal::ShardLocal(const ShardId& id) : Shard(id) { // Currently ShardLocal only works for config servers. If we ever start using ShardLocal on // shards we'll need to consider how to handle shards. @@ -140,10 +135,7 @@ Shard::HostWithResponse ShardLocal::_runCommand(OperationContext* txn, BSONObj responseMetadata = commandResponse->getMetadata().getOwned(); Status commandStatus = getStatusFromCommandResult(responseReply); - Status writeConcernStatus = kInternalErrorStatus; - if (commandStatus.isOK()) { - writeConcernStatus = getWriteConcernStatusFromCommandResult(responseReply); - } + Status writeConcernStatus = getWriteConcernStatusFromCommandResult(responseReply); return Shard::HostWithResponse(boost::none, Shard::CommandResponse{std::move(responseReply), diff --git a/src/mongo/s/client/shard_remote.cpp b/src/mongo/s/client/shard_remote.cpp index 6ae61ab1e19..3dbae46be66 100644 --- a/src/mongo/s/client/shard_remote.cpp +++ b/src/mongo/s/client/shard_remote.cpp @@ -64,9 +64,6 @@ using RemoteCommandCallbackArgs = TaskExecutor::RemoteCommandCallbackArgs; namespace { -const Status kInternalErrorStatus{ErrorCodes::InternalError, - "Invalid to check for write concern error if command failed"}; - const BSONObj kNoMetadata(rpc::makeEmptyMetadata()); // Include kReplSetMetadataFieldName in a request to get the shard's ReplSetMetadata in the |