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 4

fix: test_network_disconnect_during_migration (#4345)

Browse source
This commit is contained in:
Borys 2024-12-22 13:02:53 +02:00 • committed by GitHub
parent c5ef553ffc
commit 76000b9672
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/dragonfly/cluster_test.py
View file

@ -1433,11 +1433,15 @@ async def test_migration_with_key_ttl(df_factory):
assert await nodes[1].client.execute_command("stick k_sticky") == 0 assert await nodes[1].client.execute_command("stick k_sticky") == 0
@pytest.mark.skip("test is flaky")
@dfly_args({"proactor_threads": 4, "cluster_mode": "yes"}) @dfly_args({"proactor_threads": 4, "cluster_mode": "yes"})
async def test_network_disconnect_during_migration(df_factory): async def test_network_disconnect_during_migration(df_factory):
instances = [ instances = [
df_factory.create(port=next(next_port), admin_port=next(next_port)) for i in range(2) df_factory.create(
port=next(next_port),
admin_port=next(next_port),
vmodule="cluster_family=9,outgoing_slot_migration=9,incoming_slot_migration=9",
)
for i in range(2)
] ]
df_factory.start_all(instances) df_factory.start_all(instances)
@ -1467,12 +1471,14 @@ async def test_network_disconnect_during_migration(df_factory):
logging.debug( logging.debug(
await nodes[0].admin_client.execute_command("DFLYCLUSTER", "SLOT-MIGRATION-STATUS") await nodes[0].admin_client.execute_command("DFLYCLUSTER", "SLOT-MIGRATION-STATUS")
) )
finally:
await wait_for_status(nodes[0].admin_client, nodes[1].id, "SYNC") await wait_for_status(nodes[0].admin_client, nodes[1].id, "SYNC")
finally:
await proxy.close(task) await proxy.close(task)
await proxy.start() await proxy.start()
task = asyncio.create_task(proxy.serve())
try:
await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300) await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300)
nodes[0].migrations = [] nodes[0].migrations = []
nodes[0].slots = [] nodes[0].slots = []
@ -1481,7 +1487,8 @@ async def test_network_disconnect_during_migration(df_factory):
await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes]) await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes])
assert (await StaticSeeder.capture(nodes[1].client)) == start_capture assert (await StaticSeeder.capture(nodes[1].client)) == start_capture
await proxy.close() finally:
await proxy.close(task)
@pytest.mark.parametrize( @pytest.mark.parametrize(