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

View File

@ -4256,7 +4256,7 @@ ReservationPtr MergeTreeData::balancedReservation(
WriteBufferFromOwnString log_str;
writeCString("\nbalancer: \n", log_str);
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());
if (ttl_infos)

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)"
)
time.sleep(2)
for _ in range(10):
try:
print("Syncing replica")
node2.query("SYSTEM SYNC REPLICA tbl")
break
except:
time.sleep(0.5)
node2.query("SYSTEM SYNC REPLICA tbl", timeout=10)
check_balance(node1, "tbl")
check_balance(node2, "tbl")