thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 18:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert disabled tests

Browse Source
This commit is contained in:
alesapin 2020-06-02 21:41:29 +03:00
parent 46fcff26b0
commit 6253e9b97b
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/Distributed/DirectoryMonitor.cpp
View File

@ -269,7 +269,6 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
{ {
LOG_TRACE(log, "Started processing `{}`", file_path); LOG_TRACE(log, "Started processing `{}`", file_path);
auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.global_context->getSettingsRef()); auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(storage.global_context->getSettingsRef());
auto connection = pool->get(timeouts);
try try
{ {
@ -280,8 +279,11 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
Settings insert_settings; Settings insert_settings;
std::string insert_query; std::string insert_query;
ClientInfo client_info; ClientInfo client_info;
readHeader(in, insert_settings, insert_query, client_info, log); readHeader(in, insert_settings, insert_query, client_info, log);
auto connection = pool->get(timeouts, &insert_settings);
RemoteBlockOutputStream remote{*connection, timeouts, insert_query, insert_settings, client_info}; RemoteBlockOutputStream remote{*connection, timeouts, insert_query, insert_settings, client_info};
remote.writePrefix(); remote.writePrefix();

8
tests/integration/test_insert_distributed_load_balancing/test.py
View File

@ -46,29 +46,21 @@ def test_prefer_localhost_replica_1():
assert int(n1.query('SELECT count() FROM data')) == 10 assert int(n1.query('SELECT count() FROM data')) == 10
assert int(n2.query('SELECT count() FROM data')) == 0 assert int(n2.query('SELECT count() FROM data')) == 0
# These tests temporary (or not) disabled, because setting load_balancing
# doesn't override default value (random) neither INSERT nor CREATE query.
@pytest.mark.skip(reason="Setting load_balancing doesn't affect inserts")
def test_prefer_localhost_replica_1_load_balancing_in_order(): def test_prefer_localhost_replica_1_load_balancing_in_order():
insert_data(load_balancing='in_order') insert_data(load_balancing='in_order')
assert int(n1.query('SELECT count() FROM data')) == 10 assert int(n1.query('SELECT count() FROM data')) == 10
assert int(n2.query('SELECT count() FROM data')) == 0 assert int(n2.query('SELECT count() FROM data')) == 0
@pytest.mark.skip(reason="Setting load_balancing doesn't affect inserts")
def test_prefer_localhost_replica_0_load_balancing_nearest_hostname(): def test_prefer_localhost_replica_0_load_balancing_nearest_hostname():
insert_data(load_balancing='nearest_hostname', prefer_localhost_replica=0) insert_data(load_balancing='nearest_hostname', prefer_localhost_replica=0)
assert int(n1.query('SELECT count() FROM data')) == 10 assert int(n1.query('SELECT count() FROM data')) == 10
assert int(n2.query('SELECT count() FROM data')) == 0 assert int(n2.query('SELECT count() FROM data')) == 0
@pytest.mark.skip(reason="Setting load_balancing doesn't affect inserts")
def test_prefer_localhost_replica_0_load_balancing_in_order(): def test_prefer_localhost_replica_0_load_balancing_in_order():
insert_data(load_balancing='in_order', prefer_localhost_replica=0) insert_data(load_balancing='in_order', prefer_localhost_replica=0)
assert int(n1.query('SELECT count() FROM data')) == 0 assert int(n1.query('SELECT count() FROM data')) == 0
assert int(n2.query('SELECT count() FROM data')) == 10 assert int(n2.query('SELECT count() FROM data')) == 10
@pytest.mark.skip(reason="Setting load_balancing doesn't affect inserts")
def test_prefer_localhost_replica_0_load_balancing_in_order_sync(): def test_prefer_localhost_replica_0_load_balancing_in_order_sync():
insert_data(load_balancing='in_order', prefer_localhost_replica=0, insert_distributed_sync=1) insert_data(load_balancing='in_order', prefer_localhost_replica=0, insert_distributed_sync=1)
assert int(n1.query('SELECT count() FROM data')) == 0 assert int(n1.query('SELECT count() FROM data')) == 0