diff --git a/tests/integration/coordinator/plugins/clickhouse/conftest.py b/tests/integration/coordinator/plugins/clickhouse/conftest.py index 7316eed5..3d2d88a6 100644 --- a/tests/integration/coordinator/plugins/clickhouse/conftest.py +++ b/tests/integration/coordinator/plugins/clickhouse/conftest.py @@ -26,11 +26,7 @@ from tests.conftest import CLICKHOUSE_PATH_OPTION, CLICKHOUSE_RESTORE_PATH_OPTION from tests.integration.conftest import get_command_path, Ports, run_process_and_wait_for_pattern, Service, ServiceCluster from tests.system.conftest import background_process, wait_url_up -from tests.utils import ( - CONSTANT_TEST_RSA_PRIVATE_KEY, - CONSTANT_TEST_RSA_PUBLIC_KEY, - format_astacus_command, -) +from tests.utils import CONSTANT_TEST_RSA_PRIVATE_KEY, CONSTANT_TEST_RSA_PUBLIC_KEY, format_astacus_command import argparse import asyncio @@ -369,11 +365,12 @@ def setting(name: str, value: int | float | str): default - + remote + default - + """ @@ -404,6 +401,12 @@ def setting(name: str, value: int | float | str): {setting("number_of_free_entries_in_pool_to_execute_mutation", 2)} {setting("number_of_free_entries_in_pool_to_execute_optimize_entire_partition", 2)} + + true + false + false + false + {setting("background_pool_size", 4)} {setting("background_move_pool_size", 2)} {setting("background_fetches_pool_size", 2)} diff --git a/tests/integration/coordinator/plugins/clickhouse/test_plugin.py b/tests/integration/coordinator/plugins/clickhouse/test_plugin.py index 9341621d..48ce60d6 100644 --- a/tests/integration/coordinator/plugins/clickhouse/test_plugin.py +++ b/tests/integration/coordinator/plugins/clickhouse/test_plugin.py @@ -257,7 +257,7 @@ async def setup_cluster_content(clients: Sequence[HttpClickHouseClient], clickho await clients[0].execute( b"CREATE TABLE default.in_object_storage (thekey UInt32, thedata String) " b"ENGINE = ReplicatedMergeTree ORDER BY (thekey) " - b"SETTINGS storage_policy='remote'" + b"SETTINGS storage_policy='combination'" ) await clients[0].execute(SAMPLE_URL_ENGINE_DDL.encode()) await clients[0].execute( @@ -313,6 +313,10 @@ async def setup_cluster_content(clients: Sequence[HttpClickHouseClient], clickho await clients[0].execute(b"INSERT INTO default.in_object_storage VALUES (123, 'foo')") await clients[1].execute(b"INSERT INTO default.in_object_storage VALUES (456, 'bar')") await clients[2].execute(b"INSERT INTO default.in_object_storage VALUES (789, 'baz')") + # these should be routed to local disk + await clients[0].execute(b"INSERT INTO default.in_object_storage VALUES (1123, 'foo')") + await clients[1].execute(b"INSERT INTO default.in_object_storage VALUES (1456, 'bar')") + await clients[2].execute(b"INSERT INTO default.in_object_storage VALUES (1789, 'baz')") # This won't be backed up await clients[0].execute(b"INSERT INTO default.memory VALUES (123, 'foo')") await clients[0].execute(b"CREATE FUNCTION `linear_equation_\x80` AS (x, k, b) -> k*x + b") @@ -434,8 +438,8 @@ async def test_restores_function_table(restored_cluster: Sequence[ClickHouseClie async def check_object_storage_data(cluster: Sequence[ClickHouseClient]) -> None: - s1_data = [[123, "foo"], [456, "bar"]] - s2_data = [[789, "baz"]] + s1_data = [[123, "foo"], [456, "bar"], [1123, "foo"], [1456, "bar"]] + s2_data = [[789, "baz"], [1789, "baz"]] cluster_data = [s1_data, s1_data, s2_data] for client, expected_data in zip(cluster, cluster_data): response = await client.execute(b"SELECT thekey, thedata FROM default.in_object_storage ORDER BY thekey")