thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test and build

Browse Source
This commit is contained in:
zhangxiao871 2021-10-26 12:45:09 +08:00
parent 1710e5ea59
commit bf9aebac90
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Client/ConnectionPoolWithFailover.cpp
View File

@ -50,7 +50,6 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
return tryGetEntry(pool, timeouts, fail_message, settings);
};
GetPriorityForLoadBalancing get_priority_local(get_priority_load_balancing);
size_t offset = 0;
LoadBalancing load_balancing = get_priority_load_balancing.load_balancing;
if (settings)
@ -59,7 +58,7 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
load_balancing = LoadBalancing(settings->load_balancing);
}
GetPriorityFunc get_priority = get_priority_local.getPriorityFunc(load_balancing, offset, nested_pools.size());
GetPriorityFunc get_priority = get_priority_load_balancing.getPriorityFunc(load_balancing, offset, nested_pools.size());
UInt64 max_ignored_errors = settings ? settings->distributed_replica_max_ignored_errors.value : 0;
bool fallback_to_stale_replicas = settings ? settings->fallback_to_stale_replicas_for_distributed_queries.value : true;

2
src/Common/GetPriorityForLoadBalancing.h
View File

@ -16,7 +16,7 @@ public:
return load_balancing != other.load_balancing || hostname_differences != other.hostname_differences;
}
std::function<size_t(size_t index)> getPriorityFunc(LoadBalancing load_balancing, size_t offset, size_t pool_size) const;
std::function<size_t(size_t index)> getPriorityFunc(LoadBalancing load_balance, size_t offset, size_t pool_size) const;
std::vector<size_t> hostname_differences; /// Distances from name of this host to the names of hosts of pools.

2
tests/integration/test_zookeeper_config_load_balancing/test_first_or_random.py
View File

@ -38,7 +38,7 @@ def wait_zookeeper_node_to_start(started_cluster, zk_nodes, timeout=60):
def test_first_or_random(started_cluster):
wait_zookeeper_node_to_start(started_cluster, ["zoo1", "zoo2", "zoo3"])
time.sleep(2)
time.sleep(10)
zoo1_ip = started_cluster.get_instance_ip("zoo1")
for i, node in enumerate([node1, node3]):
node.query('DROP TABLE IF EXISTS simple SYNC')

2
tests/integration/test_zookeeper_config_load_balancing/test_in_order.py
View File

@ -38,7 +38,7 @@ def wait_zookeeper_node_to_start(started_cluster, zk_nodes, timeout=60):
def test_in_order(started_cluster):
wait_zookeeper_node_to_start(started_cluster, ["zoo1", "zoo2", "zoo3"])
time.sleep(2)
time.sleep(10)
zoo1_ip = started_cluster.get_instance_ip("zoo1")
for i, node in enumerate([node1, node3]):
node.query('DROP TABLE IF EXISTS simple SYNC')

2
tests/integration/test_zookeeper_config_load_balancing/test_nearest_hostname.py
View File

@ -38,7 +38,7 @@ def wait_zookeeper_node_to_start(started_cluster, zk_nodes, timeout=60):
def test_nearest_hostname(started_cluster):
wait_zookeeper_node_to_start(started_cluster, ["zoo1", "zoo2", "zoo3"])
time.sleep(2)
time.sleep(10)
zoo1_ip = started_cluster.get_instance_ip("zoo1")
zoo2_ip = started_cluster.get_instance_ip("zoo2")
zoo3_ip = started_cluster.get_instance_ip("zoo3")