Skip to content

Commit 76000b9

Browse files
authored
fix: test_network_disconnect_during_migration (#4345)
1 parent c5ef553 commit 76000b9

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

tests/dragonfly/cluster_test.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,11 +1433,15 @@ async def test_migration_with_key_ttl(df_factory):
14331433
assert await nodes[1].client.execute_command("stick k_sticky") == 0
14341434

14351435

1436-
@pytest.mark.skip("test is flaky")
14371436
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes"})
14381437
async def test_network_disconnect_during_migration(df_factory):
14391438
instances = [
1440-
df_factory.create(port=next(next_port), admin_port=next(next_port)) for i in range(2)
1439+
df_factory.create(
1440+
port=next(next_port),
1441+
admin_port=next(next_port),
1442+
vmodule="cluster_family=9,outgoing_slot_migration=9,incoming_slot_migration=9",
1443+
)
1444+
for i in range(2)
14411445
]
14421446

14431447
df_factory.start_all(instances)
@@ -1467,21 +1471,24 @@ async def test_network_disconnect_during_migration(df_factory):
14671471
logging.debug(
14681472
await nodes[0].admin_client.execute_command("DFLYCLUSTER", "SLOT-MIGRATION-STATUS")
14691473
)
1470-
finally:
1474+
14711475
await wait_for_status(nodes[0].admin_client, nodes[1].id, "SYNC")
1476+
finally:
14721477
await proxy.close(task)
14731478

14741479
await proxy.start()
1480+
task = asyncio.create_task(proxy.serve())
1481+
try:
1482+
await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300)
1483+
nodes[0].migrations = []
1484+
nodes[0].slots = []
1485+
nodes[1].slots = [(0, 16383)]
1486+
logging.debug("remove finished migrations")
1487+
await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes])
14751488

1476-
await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300)
1477-
nodes[0].migrations = []
1478-
nodes[0].slots = []
1479-
nodes[1].slots = [(0, 16383)]
1480-
logging.debug("remove finished migrations")
1481-
await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes])
1482-
1483-
assert (await StaticSeeder.capture(nodes[1].client)) == start_capture
1484-
await proxy.close()
1489+
assert (await StaticSeeder.capture(nodes[1].client)) == start_capture
1490+
finally:
1491+
await proxy.close(task)
14851492

14861493

14871494
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)