thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove logs

Browse Source
This commit is contained in:
Nikita Mikhaylov 2020-04-13 15:13:13 +03:00
parent a8d72d01c3
commit d5c055ab03
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -2052,8 +2052,6 @@ void StorageReplicatedMergeTree::mutationsUpdatingTask()
BackgroundProcessingPoolTaskResult StorageReplicatedMergeTree::queueTask() BackgroundProcessingPoolTaskResult StorageReplicatedMergeTree::queueTask()
{ {
LOG_FATAL(&Poco::Logger::get("queueTask()"), "begin");
/// If replication queue is stopped exit immediately as we successfully executed the task /// If replication queue is stopped exit immediately as we successfully executed the task
if (queue.actions_blocker.isCancelled()) if (queue.actions_blocker.isCancelled())
{ {
@ -2583,7 +2581,6 @@ String StorageReplicatedMergeTree::findReplicaHavingCoveringPart(
*/ */
void StorageReplicatedMergeTree::updateQuorum(const String & part_name) void StorageReplicatedMergeTree::updateQuorum(const String & part_name)
{ {
LOG_FATAL(&Poco::Logger::get("updateQuorum"), "BEGIN!");
auto zookeeper = getZooKeeper(); auto zookeeper = getZooKeeper();
/// Information on which replicas a part has been added, if the quorum has not yet been reached. /// Information on which replicas a part has been added, if the quorum has not yet been reached.
@ -3014,7 +3011,6 @@ void StorageReplicatedMergeTree::startup()
void StorageReplicatedMergeTree::shutdown() void StorageReplicatedMergeTree::shutdown()
{ {
LOG_FATAL(&Poco::Logger::get("shutdown"), "SHUTDOWN!");
clearOldPartsFromFilesystem(true); clearOldPartsFromFilesystem(true);
/// Cancel fetches, merges and mutations to force the queue_task to finish ASAP. /// Cancel fetches, merges and mutations to force the queue_task to finish ASAP.
fetcher.blocker.cancelForever(); fetcher.blocker.cancelForever();
@ -5324,17 +5320,10 @@ ActionLock StorageReplicatedMergeTree::getActionLock(StorageActionBlockType acti
return merger_mutator.ttl_merges_blocker.cancel(); return merger_mutator.ttl_merges_blocker.cancel();
if (action_type == ActionLocks::PartsFetch) if (action_type == ActionLocks::PartsFetch)
{
return fetcher.blocker.cancel(); return fetcher.blocker.cancel();
}
if (action_type == ActionLocks::PartsSend) if (action_type == ActionLocks::PartsSend)
{
LOG_FATAL(&Poco::Logger::get("ActionLock"), "Cancel PartsSend");
return data_parts_exchange_endpoint ? data_parts_exchange_endpoint->blocker.cancel() : ActionLock(); return data_parts_exchange_endpoint ? data_parts_exchange_endpoint->blocker.cancel() : ActionLock();
}
if (action_type == ActionLocks::ReplicationQueue) if (action_type == ActionLocks::ReplicationQueue)
return queue.actions_blocker.cancel(); return queue.actions_blocker.cancel();

2
tests/integration/test_polymorphic_parts/test.py
View File

@ -90,8 +90,6 @@ def test_polymorphic_parts_basics(start_cluster, first_node, second_node):
first_node.query("SYSTEM STOP MERGES") first_node.query("SYSTEM STOP MERGES")
second_node.query("SYSTEM STOP MERGES") second_node.query("SYSTEM STOP MERGES")
print(first_node.query("SELECT * FROM system.settings where name='insert_quorum' format Vertical"))
for size in [300, 300, 600]: for size in [300, 300, 600]:
insert_random_data('polymorphic_table', first_node, size) insert_random_data('polymorphic_table', first_node, size)
second_node.query("SYSTEM SYNC REPLICA polymorphic_table", timeout=20) second_node.query("SYSTEM SYNC REPLICA polymorphic_table", timeout=20)