Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: test_network_disconnect_during_migration #4345

Merged
merged 1 commit into from
Dec 22, 2024
Merged

fix: test_network_disconnect_during_migration #4345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions tests/dragonfly/cluster_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,11 +1433,15 @@ async def test_migration_with_key_ttl(df_factory):
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"})
async def test_network_disconnect_during_migration(df_factory):
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)
Expand Down Expand Up @@ -1467,21 +1471,24 @@ async def test_network_disconnect_during_migration(df_factory):
logging.debug(
await nodes[0].admin_client.execute_command("DFLYCLUSTER", "SLOT-MIGRATION-STATUS")
)
finally:

await wait_for_status(nodes[0].admin_client, nodes[1].id, "SYNC")
finally:
await proxy.close(task)

await proxy.start()
task = asyncio.create_task(proxy.serve())
try:
await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300)
nodes[0].migrations = []
nodes[0].slots = []
nodes[1].slots = [(0, 16383)]
logging.debug("remove finished migrations")
await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes])

await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300)
nodes[0].migrations = []
nodes[0].slots = []
nodes[1].slots = [(0, 16383)]
logging.debug("remove finished migrations")
await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes])

assert (await StaticSeeder.capture(nodes[1].client)) == start_capture
await proxy.close()
assert (await StaticSeeder.capture(nodes[1].client)) == start_capture
finally:
await proxy.close(task)


@pytest.mark.parametrize(
Expand Down
Loading