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

Small improvement

Browse Source
This commit is contained in:
Michael Kolupaev 2024-09-13 04:12:28 +00:00
parent e6ec9eaad3
commit adb905a692
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -1224,7 +1224,7 @@ bool StorageReplicatedMergeTree::dropReplica(
if (zookeeper->expired()) if (zookeeper->expired())
throw Exception(ErrorCodes::TABLE_WAS_NOT_DROPPED, "Table was not dropped because ZooKeeper session has expired."); throw Exception(ErrorCodes::TABLE_WAS_NOT_DROPPED, "Table was not dropped because ZooKeeper session has expired.");
String zookeeper_path = zookeeper_info.path; const String & zookeeper_path = zookeeper_info.path;
auto remote_replica_path = zookeeper_path + "/replicas/" + zookeeper_info.replica_name; auto remote_replica_path = zookeeper_path + "/replicas/" + zookeeper_info.replica_name;
LOG_INFO(logger, "Removing replica {}, marking it as lost", remote_replica_path); LOG_INFO(logger, "Removing replica {}, marking it as lost", remote_replica_path);
@ -1362,7 +1362,7 @@ bool StorageReplicatedMergeTree::dropReplica(const String & drop_replica, Logger
bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper, bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeperPtr zookeeper,
const TableZnodeInfo & zookeeper_info2, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, LoggerPtr logger) const TableZnodeInfo & zookeeper_info2, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, LoggerPtr logger)
{ {
String zookeeper_path = zookeeper_info2.path; const String & zookeeper_path = zookeeper_info2.path;
bool completely_removed = false; bool completely_removed = false;
/// NOTE /block_numbers/ actually is not flat, because /block_numbers/<partition_id>/ may have ephemeral children, /// NOTE /block_numbers/ actually is not flat, because /block_numbers/<partition_id>/ may have ephemeral children,
@ -1430,15 +1430,15 @@ bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeper
metadata_drop_lock->setAlreadyRemoved(); metadata_drop_lock->setAlreadyRemoved();
completely_removed = true; completely_removed = true;
LOG_INFO(logger, "Table {} was successfully removed from ZooKeeper", zookeeper_path); LOG_INFO(logger, "Table {} was successfully removed from ZooKeeper", zookeeper_path);
}
try try
{ {
zookeeper_info2.dropAncestorZnodesIfNeeded(zookeeper); zookeeper_info2.dropAncestorZnodesIfNeeded(zookeeper);
} }
catch (...) catch (...)
{ {
LOG_WARNING(logger, "Failed to drop ancestor znodes {} - {} after dropping table: {}", zookeeper_info2.path_prefix_for_drop, zookeeper_info2.path, getCurrentExceptionMessage(false)); LOG_WARNING(logger, "Failed to drop ancestor znodes {} - {} after dropping table: {}", zookeeper_info2.path_prefix_for_drop, zookeeper_info2.path, getCurrentExceptionMessage(false));
}
} }
return completely_removed; return completely_removed;