diff options
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r-- | src/mongo/db/s/config/configsvr_drop_collection_command.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/metadata_manager.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/migration_destination_manager.cpp | 18 | ||||
-rw-r--r-- | src/mongo/db/s/migration_source_manager.cpp | 8 | ||||
-rw-r--r-- | src/mongo/db/s/move_chunk_command.cpp | 14 |
6 files changed, 23 insertions, 23 deletions
diff --git a/src/mongo/db/s/config/configsvr_drop_collection_command.cpp b/src/mongo/db/s/config/configsvr_drop_collection_command.cpp index 2e91223c164..c16b4fec09a 100644 --- a/src/mongo/db/s/config/configsvr_drop_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_drop_collection_command.cpp @@ -49,7 +49,7 @@ namespace mongo { namespace { -MONGO_FP_DECLARE(setDropCollDistLockWait); +MONGO_FAIL_POINT_DEFINE(setDropCollDistLockWait); /** * Internal sharding command run on config servers to drop a collection from a database. diff --git a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp index e1e8374c5c3..3350dae2a5c 100644 --- a/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp +++ b/src/mongo/db/s/config/sharding_catalog_manager_chunk_operations.cpp @@ -55,7 +55,7 @@ namespace mongo { namespace { -MONGO_FP_DECLARE(migrationCommitVersionError); +MONGO_FAIL_POINT_DEFINE(migrationCommitVersionError); /** * Append min, max and version information from chunk to the buffer for logChange purposes. diff --git a/src/mongo/db/s/metadata_manager.cpp b/src/mongo/db/s/metadata_manager.cpp index 070b8b0710a..941772e0dac 100644 --- a/src/mongo/db/s/metadata_manager.cpp +++ b/src/mongo/db/s/metadata_manager.cpp @@ -116,7 +116,7 @@ namespace { using TaskExecutor = executor::TaskExecutor; using CallbackArgs = TaskExecutor::CallbackArgs; -MONGO_FP_DECLARE(suspendRangeDeletion); +MONGO_FAIL_POINT_DEFINE(suspendRangeDeletion); /** * Deletes ranges, in background, until done, normally using a task executor attached to the diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp index b1545848bd5..6c18f329b17 100644 --- a/src/mongo/db/s/migration_destination_manager.cpp +++ b/src/mongo/db/s/migration_destination_manager.cpp @@ -197,15 +197,15 @@ BSONObj createTransferModsRequest(const NamespaceString& nss, const MigrationSes // Enabling / disabling these fail points pauses / resumes MigrateStatus::_go(), the thread which // receives a chunk migration from the donor. -MONGO_FP_DECLARE(migrateThreadHangAtStep1); -MONGO_FP_DECLARE(migrateThreadHangAtStep2); -MONGO_FP_DECLARE(migrateThreadHangAtStep3); -MONGO_FP_DECLARE(migrateThreadHangAtStep4); -MONGO_FP_DECLARE(migrateThreadHangAtStep5); -MONGO_FP_DECLARE(migrateThreadHangAtStep6); - -MONGO_FP_DECLARE(failMigrationLeaveOrphans); -MONGO_FP_DECLARE(failMigrationReceivedOutOfRangeOperation); +MONGO_FAIL_POINT_DEFINE(migrateThreadHangAtStep1); +MONGO_FAIL_POINT_DEFINE(migrateThreadHangAtStep2); +MONGO_FAIL_POINT_DEFINE(migrateThreadHangAtStep3); +MONGO_FAIL_POINT_DEFINE(migrateThreadHangAtStep4); +MONGO_FAIL_POINT_DEFINE(migrateThreadHangAtStep5); +MONGO_FAIL_POINT_DEFINE(migrateThreadHangAtStep6); + +MONGO_FAIL_POINT_DEFINE(failMigrationLeaveOrphans); +MONGO_FAIL_POINT_DEFINE(failMigrationReceivedOutOfRangeOperation); } // namespace diff --git a/src/mongo/db/s/migration_source_manager.cpp b/src/mongo/db/s/migration_source_manager.cpp index e68dc4c443f..97aa70f72d9 100644 --- a/src/mongo/db/s/migration_source_manager.cpp +++ b/src/mongo/db/s/migration_source_manager.cpp @@ -126,10 +126,10 @@ Status checkCollectionEpochMatches(const ScopedCollectionMetadata& metadata, OID } // namespace -MONGO_FP_DECLARE(doNotRefreshRecipientAfterCommit); -MONGO_FP_DECLARE(failMigrationCommit); -MONGO_FP_DECLARE(hangBeforeLeavingCriticalSection); -MONGO_FP_DECLARE(migrationCommitNetworkError); +MONGO_FAIL_POINT_DEFINE(doNotRefreshRecipientAfterCommit); +MONGO_FAIL_POINT_DEFINE(failMigrationCommit); +MONGO_FAIL_POINT_DEFINE(hangBeforeLeavingCriticalSection); +MONGO_FAIL_POINT_DEFINE(migrationCommitNetworkError); MigrationSourceManager* MigrationSourceManager::get(CollectionShardingState& css) { return msmForCss(css); diff --git a/src/mongo/db/s/move_chunk_command.cpp b/src/mongo/db/s/move_chunk_command.cpp index 80b31ba76c7..d90b4b2dddf 100644 --- a/src/mongo/db/s/move_chunk_command.cpp +++ b/src/mongo/db/s/move_chunk_command.cpp @@ -65,13 +65,13 @@ void uassertStatusOKWithWarning(const Status& status) { } // Tests can pause and resume moveChunk's progress at each step by enabling/disabling each failpoint -MONGO_FP_DECLARE(moveChunkHangAtStep1); -MONGO_FP_DECLARE(moveChunkHangAtStep2); -MONGO_FP_DECLARE(moveChunkHangAtStep3); -MONGO_FP_DECLARE(moveChunkHangAtStep4); -MONGO_FP_DECLARE(moveChunkHangAtStep5); -MONGO_FP_DECLARE(moveChunkHangAtStep6); -MONGO_FP_DECLARE(moveChunkHangAtStep7); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep1); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep2); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep3); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep4); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep5); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep6); +MONGO_FAIL_POINT_DEFINE(moveChunkHangAtStep7); class MoveChunkCommand : public BasicCommand { public: |