mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: Cancel outgoing migration when retrying / closing (#3339)

Browse source
This commit is contained in:
Shahar Mike 2024-07-19 10:49:49 +03:00 • committed by GitHub
parent 8a2d6ad1f4
commit 2b54fd985f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/cluster/outgoing_slot_migration.cc
View file

@ -34,6 +34,10 @@ class OutgoingMigration::SliceSlotMigration : private ProtocolClient {
: ProtocolClient(server_context), streamer_(slice, std::move(slots), journal, &cntx_) { : ProtocolClient(server_context), streamer_(slice, std::move(slots), journal, &cntx_) {
} }
~SliceSlotMigration() {
streamer_.Cancel();
}
// Send DFLYMIGRATE FLOW // Send DFLYMIGRATE FLOW
void PrepareFlow(const std::string& node_id) { void PrepareFlow(const std::string& node_id) {
uint32_t shard_id = EngineShard::tlocal()->shard_id(); uint32_t shard_id = EngineShard::tlocal()->shard_id();

1
tests/dragonfly/cluster_test.py
View file

@ -1074,7 +1074,6 @@ async def test_config_consistency(df_factory: DflyInstanceFactory):
await close_clients(*[node.client for node in nodes], *[node.admin_client for node in nodes]) await close_clients(*[node.client for node in nodes], *[node.admin_client for node in nodes])
@pytest.mark.skip("Deadlocks on CI, see #3302")
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes"}) @dfly_args({"proactor_threads": 4, "cluster_mode": "yes"})
async def test_cluster_flushall_during_migration( async def test_cluster_flushall_during_migration(
df_factory: DflyInstanceFactory, df_seeder_factory df_factory: DflyInstanceFactory, df_seeder_factory