diff options
author | Dan Pasette <dan@mongodb.com> | 2016-08-26 23:32:30 -0400 |
---|---|---|
committer | Dan Pasette <dan@mongodb.com> | 2016-08-26 23:32:30 -0400 |
commit | f21afe8e60b5ab6f061613c3ee0f8ff9896e881a (patch) | |
tree | f9f4c15c13dfc9f4543cc46c38391b22ebdee373 /src/mongo/db/s | |
parent | 355ff243409c2a330d64f212d809609402e80bb9 (diff) | |
download | mongo-f21afe8e60b5ab6f061613c3ee0f8ff9896e881a.tar.gz |
Revert "SERVER-25832 Rename Shard::runCommand to Shard::runCommandWithFixedRetryAttempts"
This reverts commit 7614c0eb2449eb4ec22d21b677177124d61f1888.
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r-- | src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/migration_source_manager.cpp | 13 | ||||
-rw-r--r-- | src/mongo/db/s/split_chunk_command.cpp | 13 |
3 files changed, 13 insertions, 15 deletions
diff --git a/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp b/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp index ece43e1b676..59b234f5eae 100644 --- a/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp +++ b/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp @@ -273,7 +273,7 @@ public: } auto applyOpsCommandResponse = - Grid::get(txn)->shardRegistry()->getConfigShard()->runCommandWithFixedRetryAttempts( + Grid::get(txn)->shardRegistry()->getConfigShard()->runCommand( txn, ReadPreferenceSetting{ReadPreference::PrimaryOnly}, nss.db().toString(), diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index 9fdd4f04a83..f1bb4701e34 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -320,13 +320,12 @@ Status MigrationSourceManager::commitDonateChunk(OperationContext* txn) { MONGO_FAIL_POINT_PAUSE_WHILE_SET(hangBeforeCommitMigration); - auto commitChunkMigrationResponse = - grid.shardRegistry()->getConfigShard()->runCommandWithFixedRetryAttempts( - txn, - ReadPreferenceSetting{ReadPreference::PrimaryOnly}, - "admin", - builder.obj(), - Shard::RetryPolicy::kIdempotent); + auto commitChunkMigrationResponse = grid.shardRegistry()->getConfigShard()->runCommand( + txn, + ReadPreferenceSetting{ReadPreference::PrimaryOnly}, + "admin", + builder.obj(), + Shard::RetryPolicy::kIdempotent); if (MONGO_FAIL_POINT(failCommitMigrationCommand)) { commitChunkMigrationResponse = Status( diff --git a/src/mongo/db/s/split_chunk_command.cpp b/src/mongo/db/s/split_chunk_command.cpp index f4ceaf19855..8f40c2fcf94 100644 --- a/src/mongo/db/s/split_chunk_command.cpp +++ b/src/mongo/db/s/split_chunk_command.cpp @@ -354,13 +354,12 @@ public: auto configCmdObj = request.toConfigCommandBSON( BSON(WriteConcernOptions::kWriteConcernField << WriteConcernOptions::Majority)); - auto cmdResponseStatus = - Grid::get(txn)->shardRegistry()->getConfigShard()->runCommandWithFixedRetryAttempts( - txn, - kPrimaryOnlyReadPreference, - "admin", - configCmdObj, - Shard::RetryPolicy::kIdempotent); + auto cmdResponseStatus = Grid::get(txn)->shardRegistry()->getConfigShard()->runCommand( + txn, + kPrimaryOnlyReadPreference, + "admin", + configCmdObj, + Shard::RetryPolicy::kIdempotent); // // Refresh chunk metadata regardless of whether or not the split succeeded |