diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2016-08-26 17:47:07 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@mongodb.com> | 2016-08-26 18:23:45 -0400 |
| commit | 7614c0eb2449eb4ec22d21b677177124d61f1888 (patch) | |
| tree | 270f40e904bec17cbb30f696450e3401cfe03172 /src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp | |
| parent | ff52022e5cd7ff7c75daf24c8760f0377785ba1e (diff) | |
| download | mongo-7614c0eb2449eb4ec22d21b677177124d61f1888.tar.gz | |
SERVER-25832 Rename Shard::runCommand to Shard::runCommandWithFixedRetryAttempts
Diffstat (limited to 'src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp')
| -rw-r--r-- | src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp b/src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp index b88ca069558..0d45188c3de 100644 --- a/src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp +++ b/src/mongo/s/catalog/replset/dist_lock_catalog_impl.cpp @@ -178,13 +178,13 @@ Status DistLockCatalogImpl::ping(OperationContext* txn, StringData processID, Da request.setUpsert(true); request.setWriteConcern(kMajorityWriteConcern); - auto resultStatus = - _client->getConfigShard()->runCommand(txn, - ReadPreferenceSetting{ReadPreference::PrimaryOnly}, - _locksNS.db().toString(), - request.toBSON(), - Shard::kDefaultConfigCommandTimeout, - Shard::RetryPolicy::kNotIdempotent); + auto resultStatus = _client->getConfigShard()->runCommandWithFixedRetryAttempts( + txn, + ReadPreferenceSetting{ReadPreference::PrimaryOnly}, + _locksNS.db().toString(), + request.toBSON(), + Shard::kDefaultConfigCommandTimeout, + Shard::RetryPolicy::kNotIdempotent); auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus)); return findAndModifyStatus.getStatus(); @@ -214,7 +214,7 @@ StatusWith<LocksType> DistLockCatalogImpl::grabLock(OperationContext* txn, request.setShouldReturnNew(true); request.setWriteConcern(kMajorityWriteConcern); - auto resultStatus = _client->getConfigShard()->runCommand( + auto resultStatus = _client->getConfigShard()->runCommandWithFixedRetryAttempts( txn, ReadPreferenceSetting{ReadPreference::PrimaryOnly}, _locksNS.db().toString(), @@ -271,13 +271,13 @@ StatusWith<LocksType> DistLockCatalogImpl::overtakeLock(OperationContext* txn, request.setShouldReturnNew(true); request.setWriteConcern(kMajorityWriteConcern); - auto resultStatus = - _client->getConfigShard()->runCommand(txn, - ReadPreferenceSetting{ReadPreference::PrimaryOnly}, - _locksNS.db().toString(), - request.toBSON(), - Shard::kDefaultConfigCommandTimeout, - Shard::RetryPolicy::kNotIdempotent); + auto resultStatus = _client->getConfigShard()->runCommandWithFixedRetryAttempts( + txn, + ReadPreferenceSetting{ReadPreference::PrimaryOnly}, + _locksNS.db().toString(), + request.toBSON(), + Shard::kDefaultConfigCommandTimeout, + Shard::RetryPolicy::kNotIdempotent); auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus)); if (!findAndModifyStatus.isOK()) { @@ -316,13 +316,13 @@ Status DistLockCatalogImpl::unlock(OperationContext* txn, } Status DistLockCatalogImpl::_unlock(OperationContext* txn, const FindAndModifyRequest& request) { - auto resultStatus = - _client->getConfigShard()->runCommand(txn, - ReadPreferenceSetting{ReadPreference::PrimaryOnly}, - _locksNS.db().toString(), - request.toBSON(), - Shard::kDefaultConfigCommandTimeout, - Shard::RetryPolicy::kIdempotent); + auto resultStatus = _client->getConfigShard()->runCommandWithFixedRetryAttempts( + txn, + ReadPreferenceSetting{ReadPreference::PrimaryOnly}, + _locksNS.db().toString(), + request.toBSON(), + Shard::kDefaultConfigCommandTimeout, + Shard::RetryPolicy::kIdempotent); auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus)); if (findAndModifyStatus == ErrorCodes::LockStateChangeFailed) { @@ -351,13 +351,13 @@ Status DistLockCatalogImpl::unlockAll(OperationContext* txn, const std::string& BSONObj cmdObj = request.toBSON(); - auto response = - _client->getConfigShard()->runCommand(txn, - ReadPreferenceSetting{ReadPreference::PrimaryOnly}, - _locksNS.db().toString(), - cmdObj, - Shard::kDefaultConfigCommandTimeout, - Shard::RetryPolicy::kIdempotent); + auto response = _client->getConfigShard()->runCommandWithFixedRetryAttempts( + txn, + ReadPreferenceSetting{ReadPreference::PrimaryOnly}, + _locksNS.db().toString(), + cmdObj, + Shard::kDefaultConfigCommandTimeout, + Shard::RetryPolicy::kIdempotent); if (!response.isOK()) { return response.getStatus(); @@ -382,12 +382,13 @@ Status DistLockCatalogImpl::unlockAll(OperationContext* txn, const std::string& } StatusWith<DistLockCatalog::ServerInfo> DistLockCatalogImpl::getServerInfo(OperationContext* txn) { - auto resultStatus = _client->getConfigShard()->runCommand(txn, - kReadPref, - "admin", - BSON("serverStatus" << 1), - Shard::kDefaultConfigCommandTimeout, - Shard::RetryPolicy::kIdempotent); + auto resultStatus = _client->getConfigShard()->runCommandWithFixedRetryAttempts( + txn, + kReadPref, + "admin", + BSON("serverStatus" << 1), + Shard::kDefaultConfigCommandTimeout, + Shard::RetryPolicy::kIdempotent); if (!resultStatus.isOK()) { return resultStatus.getStatus(); @@ -473,13 +474,13 @@ Status DistLockCatalogImpl::stopPing(OperationContext* txn, StringData processId FindAndModifyRequest::makeRemove(_lockPingNS, BSON(LockpingsType::process() << processId)); request.setWriteConcern(kMajorityWriteConcern); - auto resultStatus = - _client->getConfigShard()->runCommand(txn, - ReadPreferenceSetting{ReadPreference::PrimaryOnly}, - _locksNS.db().toString(), - request.toBSON(), - Shard::kDefaultConfigCommandTimeout, - Shard::RetryPolicy::kNotIdempotent); + auto resultStatus = _client->getConfigShard()->runCommandWithFixedRetryAttempts( + txn, + ReadPreferenceSetting{ReadPreference::PrimaryOnly}, + _locksNS.db().toString(), + request.toBSON(), + Shard::kDefaultConfigCommandTimeout, + Shard::RetryPolicy::kNotIdempotent); auto findAndModifyStatus = extractFindAndModifyNewObj(std::move(resultStatus)); return findAndModifyStatus.getStatus(); |