thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52408 from ClickHouse/fix-test_keeper_force_recovery

Browse Source 
Fix `test_keeper_force_recovery`
This commit is contained in:
robot-ch-test-poll 2023-07-22 00:22:54 +02:00 committed by GitHub
commit 8175ba8ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper1.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>1</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper2.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>2</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper3.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>3</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper4.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>4</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper5.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>5</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper6.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>6</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper7.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>7</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/enable_keeper8.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>8</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery/configs/recovered_keeper1.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>1</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

36
tests/integration/test_keeper_force_recovery/configs/use_keeper.xml
View File

@ -1,36 +0,0 @@
<clickhouse>
<zookeeper>
<node index="1">
<host>node1</host>
<port>9181</port>
</node>
<node index="2">
<host>node2</host>
<port>9181</port>
</node>
<node index="3">
<host>node3</host>
<port>9181</port>
</node>
<node index="4">
<host>node4</host>
<port>9181</port>
</node>
<node index="5">
<host>node5</host>
<port>9181</port>
</node>
<node index="6">
<host>node6</host>
<port>9181</port>
</node>
<node index="7">
<host>node7</host>
<port>9181</port>
</node>
<node index="8">
<host>node8</host>
<port>9181</port>
</node>
</zookeeper>
</clickhouse>

5
tests/integration/test_keeper_force_recovery/test.py
View File

@ -22,10 +22,7 @@ def get_nodes():
nodes.append(
cluster.add_instance(
f"node{i+1}",
main_configs=[
f"configs/enable_keeper{i+1}.xml",
f"configs/use_keeper.xml",
],
main_configs=[f"configs/enable_keeper{i+1}.xml"],
stay_alive=True,
)
)

2
tests/integration/test_keeper_force_recovery_single_node/configs/enable_keeper1.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>1</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery_single_node/configs/enable_keeper1_solo.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<force_recovery>1</force_recovery>
<tcp_port>9181</tcp_port>
<server_id>1</server_id>
@ -11,6 +12,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery_single_node/configs/enable_keeper2.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>2</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

2
tests/integration/test_keeper_force_recovery_single_node/configs/enable_keeper3.xml
View File

@ -1,5 +1,6 @@
<clickhouse>
<keeper_server>
<use_cluster>false</use_cluster>
<tcp_port>9181</tcp_port>
<server_id>3</server_id>
<log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
@ -10,6 +11,7 @@
<session_timeout_ms>10000</session_timeout_ms>
<snapshot_distance>75</snapshot_distance>
<raft_logs_level>trace</raft_logs_level>
<max_requests_batch_size>200</max_requests_batch_size>
</coordination_settings>
<raft_configuration>

16
tests/integration/test_keeper_force_recovery_single_node/configs/use_keeper.xml
View File

@ -1,16 +0,0 @@
<clickhouse>
<zookeeper>
<node index="1">
<host>node1</host>
<port>9181</port>
</node>
<node index="2">
<host>node2</host>
<port>9181</port>
</node>
<node index="3">
<host>node3</host>
<port>9181</port>
</node>
</zookeeper>
</clickhouse>

5
tests/integration/test_keeper_force_recovery_single_node/test.py
View File

@ -20,10 +20,7 @@ def get_nodes():
nodes.append(
cluster.add_instance(
f"node{i+1}",
main_configs=[
f"configs/enable_keeper{i+1}.xml",
f"configs/use_keeper.xml",
],
main_configs=[f"configs/enable_keeper{i+1}.xml"],
stay_alive=True,
)
)