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

update

Browse Source
This commit is contained in:
Amos Bird 2021-03-10 02:56:46 +08:00
parent 2ec20c5d23
commit e52b2fb8ae
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -4256,7 +4256,7 @@ ReservationPtr MergeTreeData::balancedReservation(
WriteBufferFromOwnString log_str; WriteBufferFromOwnString log_str;
writeCString("\nbalancer: \n", log_str); writeCString("\nbalancer: \n", log_str);
for (const auto & [disk_name, per_disk_parts] : disk_parts_for_logging) for (const auto & [disk_name, per_disk_parts] : disk_parts_for_logging)
writeString(fmt::format(" {}: [{}]\n", disk_name, boost::algorithm::join(per_disk_parts, ", ")), log_str); writeString(fmt::format(" {}: [{}]\n", disk_name, fmt::join(per_disk_parts, ", ")), log_str);
LOG_DEBUG(log, log_str.str()); LOG_DEBUG(log, log_str.str());
if (ttl_infos) if (ttl_infos)

10
tests/integration/test_jbod_balancer/test.py
View File

@ -170,15 +170,7 @@ def test_replicated_balanced_merge_fetch(start_cluster):
"insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)" "insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
) )
time.sleep(2) node2.query("SYSTEM SYNC REPLICA tbl", timeout=10)
for _ in range(10):
try:
print("Syncing replica")
node2.query("SYSTEM SYNC REPLICA tbl")
break
except:
time.sleep(0.5)
check_balance(node1, "tbl") check_balance(node1, "tbl")
check_balance(node2, "tbl") check_balance(node2, "tbl")