diff options
Diffstat (limited to 'src/mongo/db/s/resharding/resharding_donor_service_test.cpp')
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_donor_service_test.cpp | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/mongo/db/s/resharding/resharding_donor_service_test.cpp b/src/mongo/db/s/resharding/resharding_donor_service_test.cpp index 16e1507be1c..663b8c28136 100644 --- a/src/mongo/db/s/resharding/resharding_donor_service_test.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_service_test.cpp @@ -34,6 +34,7 @@ #include <boost/optional/optional_io.hpp> #include <utility> +#include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/op_observer_noop.h" #include "mongo/db/op_observer_registry.h" @@ -52,7 +53,6 @@ #include "mongo/db/s/resharding/resharding_donor_service.h" #include "mongo/db/s/resharding/resharding_service_test_helpers.h" #include "mongo/db/s/resharding/resharding_util.h" -#include "mongo/db/s/sharding_ddl_util.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/unittest/death_test.h" @@ -84,8 +84,7 @@ public: const BSONObj& query, const BSONObj& update) override {} - void refreshCollectionPlacementInfo(OperationContext* opCtx, - const NamespaceString& sourceNss) override {} + void clearFilteringMetadata(OperationContext* opCtx) override {} }; class DonorOpObserverForTest : public OpObserverForTest { @@ -162,8 +161,7 @@ public: void createSourceCollection(OperationContext* opCtx, const ReshardingDonorDocument& donorDoc) { CollectionOptions options; options.uuid = donorDoc.getSourceUUID(); - mongo::sharding_ddl_util::ensureCollectionDroppedNoChangeEvent(opCtx, - donorDoc.getSourceNss()); + resharding::data_copy::ensureCollectionDropped(opCtx, donorDoc.getSourceNss()); resharding::data_copy::ensureCollectionExists(opCtx, donorDoc.getSourceNss(), options); } @@ -171,8 +169,7 @@ public: const ReshardingDonorDocument& donorDoc) { CollectionOptions options; options.uuid = donorDoc.getReshardingUUID(); - mongo::sharding_ddl_util::ensureCollectionDroppedNoChangeEvent( - opCtx, donorDoc.getTempReshardingNss()); + resharding::data_copy::ensureCollectionDropped(opCtx, donorDoc.getTempReshardingNss()); resharding::data_copy::ensureCollectionExists( opCtx, donorDoc.getTempReshardingNss(), options); } @@ -418,10 +415,8 @@ TEST_F(ReshardingDonorServiceTest, StepDownStepUpEachTransition) { DonorStateMachine::insertStateDocument(opCtx.get(), doc); return DonorStateMachine::getOrCreate(opCtx.get(), _service, doc.toBSON()); } else { - auto [maybeDonor, isPausedOrShutdown] = - DonorStateMachine::lookup(opCtx.get(), _service, instanceId); - ASSERT_TRUE(maybeDonor); - ASSERT_FALSE(isPausedOrShutdown); + auto maybeDonor = DonorStateMachine::lookup(opCtx.get(), _service, instanceId); + ASSERT_TRUE(bool(maybeDonor)); // Allow the transition to prevState to succeed on this primary-only service // instance. @@ -482,10 +477,8 @@ TEST_F(ReshardingDonorServiceTest, StepDownStepUpEachTransition) { } // Finally complete the operation and ensure its success. - auto [maybeDonor, isPausedOrShutdown] = - DonorStateMachine::lookup(opCtx.get(), _service, instanceId); - ASSERT_TRUE(maybeDonor); - ASSERT_FALSE(isPausedOrShutdown); + auto maybeDonor = DonorStateMachine::lookup(opCtx.get(), _service, instanceId); + ASSERT_TRUE(bool(maybeDonor)); auto donor = *maybeDonor; stateTransitionsGuard.unset(DonorStateEnum::kDone); @@ -615,10 +608,8 @@ TEST_F(ReshardingDonorServiceTest, CompletesWithStepdownAfterAbort) { donor.reset(); stepUp(opCtx.get()); - auto [maybeDonor, isPausedOrShutdown] = - DonorStateMachine::lookup(opCtx.get(), _service, instanceId); - ASSERT_TRUE(maybeDonor); - ASSERT_FALSE(isPausedOrShutdown); + auto maybeDonor = DonorStateMachine::lookup(opCtx.get(), _service, instanceId); + ASSERT_TRUE(bool(maybeDonor)); donor = *maybeDonor; doneTransitionGuard.reset(); |