Merge pull request #8442 from ClickHouse/ddlworker-trash

Removed trash from DDLWorker
This commit is contained in:
alexey-milovidov 2019-12-28 01:27:53 +03:00 committed by GitHub
commit 9e8c3acffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -941,22 +941,19 @@ void DDLWorker::runMainThread()
{
try
{
try
{
auto zookeeper = getAndSetZooKeeper();
zookeeper->createAncestors(queue_dir + "/");
initialized = true;
}
catch (const Coordination::Exception & e)
{
if (!Coordination::isHardwareError(e.code))
throw; /// A logical error.
auto zookeeper = getAndSetZooKeeper();
zookeeper->createAncestors(queue_dir + "/");
initialized = true;
}
catch (const Coordination::Exception & e)
{
if (!Coordination::isHardwareError(e.code))
throw; /// A logical error.
tryLogCurrentException(__PRETTY_FUNCTION__);
tryLogCurrentException(__PRETTY_FUNCTION__);
/// Avoid busy loop when ZooKeeper is not available.
sleepForSeconds(1);
}
/// Avoid busy loop when ZooKeeper is not available.
sleepForSeconds(1);
}
catch (...)
{