From be36aeb7166b2e06dd47dd0769ea28cbb7250041 Mon Sep 17 00:00:00 2001 From: Kaloian Manassiev Date: Thu, 21 Mar 2019 13:14:40 -0400 Subject: SERVER-40223 Use the AsyncWorkScheduler to run local command when recovering a coordinator decision --- src/mongo/s/client/shard.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/mongo/s/client/shard.cpp') diff --git a/src/mongo/s/client/shard.cpp b/src/mongo/s/client/shard.cpp index 7f6ea898854..e2c751529e2 100644 --- a/src/mongo/s/client/shard.cpp +++ b/src/mongo/s/client/shard.cpp @@ -41,9 +41,6 @@ #include "mongo/util/log.h" namespace mongo { - -using std::string; - namespace { const int kOnErrorNumRetries = 3; @@ -76,7 +73,7 @@ Status Shard::CommandResponse::processBatchWriteResponse( StatusWith swResponse, BatchedCommandResponse* batchResponse) { auto status = getEffectiveStatus(swResponse); if (status.isOK()) { - string errmsg; + std::string errmsg; if (!batchResponse->parseBSON(swResponse.getValue().response, &errmsg)) { status = Status(ErrorCodes::FailedToParse, str::stream() << "Failed to parse write response: " << errmsg); @@ -202,8 +199,7 @@ BatchedCommandResponse Shard::runBatchWriteCommand(OperationContext* opCtx, const Milliseconds maxTimeMS, const BatchedCommandRequest& batchRequest, RetryPolicy retryPolicy) { - const std::string dbname = batchRequest.getNS().db().toString(); - + const StringData dbname = batchRequest.getNS().db(); const BSONObj cmdObj = batchRequest.toBSON(); for (int retry = 1; retry <= kOnErrorNumRetries; ++retry) { -- cgit v1.2.1