From 8237d8fa815c6c380eb8d46687946355da9a8acf Mon Sep 17 00:00:00 2001 From: Borys Date: Mon, 16 Dec 2024 13:42:56 +0200 Subject: [PATCH] refactor: remove serialization_max_chunk_size for cluster tests (#4316) --- tests/dragonfly/cluster_test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/dragonfly/cluster_test.py b/tests/dragonfly/cluster_test.py index f51e7393a..5b12ec6fa 100644 --- a/tests/dragonfly/cluster_test.py +++ b/tests/dragonfly/cluster_test.py @@ -1433,7 +1433,7 @@ async def test_migration_with_key_ttl(df_factory): assert await nodes[1].client.execute_command("stick k_sticky") == 0 -@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "serialization_max_chunk_size": 0}) +@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) @@ -1472,7 +1472,7 @@ async def test_network_disconnect_during_migration(df_factory): await proxy.start() - await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 60) + await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 300) nodes[0].migrations = [] nodes[0].slots = [] nodes[1].slots = [(0, 16383)] @@ -1970,7 +1970,7 @@ async def test_cluster_migration_cancel(df_factory: DflyInstanceFactory): assert str(i) == await nodes[1].client.get(f"{{key50}}:{i}") -@dfly_args({"proactor_threads": 2, "cluster_mode": "yes", "serialization_max_chunk_size": 0}) +@dfly_args({"proactor_threads": 2, "cluster_mode": "yes"}) @pytest.mark.asyncio async def test_cluster_migration_huge_container(df_factory: DflyInstanceFactory): instances = [ @@ -2003,7 +2003,7 @@ async def test_cluster_migration_huge_container(df_factory: DflyInstanceFactory) await push_config(json.dumps(generate_config(nodes)), [node.admin_client for node in nodes]) logging.debug("Waiting for migration to finish") - await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED") + await wait_for_status(nodes[0].admin_client, nodes[1].id, "FINISHED", 30) target_data = await StaticSeeder.capture(nodes[1].client) assert source_data == target_data @@ -2433,7 +2433,7 @@ async def test_cluster_memory_consumption_migration(df_factory: DflyInstanceFact @pytest.mark.asyncio -@dfly_args({"proactor_threads": 4, "cluster_mode": "yes", "serialization_max_chunk_size": 0}) +@dfly_args({"proactor_threads": 4, "cluster_mode": "yes"}) async def test_migration_timeout_on_sync(df_factory: DflyInstanceFactory, df_seeder_factory): # Timeout set to 3 seconds because we must first saturate the socket before we get the timeout instances = [