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

dbms: fixed one of errors [#METR-13979].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-11-28 23:45:33 +03:00
parent 76ba1f053b
commit b2696ffec1
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
View File

@ -40,10 +40,25 @@ void ReplicatedMergeTreeRestartingThread::run()
if (storage.zookeeper->expired())
{
LOG_WARNING(log, "ZooKeeper session has expired. Switching to a new session.");
storage.is_read_only = true;
partialShutdown();
storage.zookeeper = storage.context.getZooKeeper();
storage.is_read_only = true;
do
{
try
{
/// TODO race condition при присваивании?
storage.zookeeper = storage.context.getZooKeeper();
}
catch (const zkutil::KeeperException & e)
{
/// Исключение при попытке zookeeper_init обычно бывает, если не работает DNS. Будем пытаться сделать это заново.
tryLogCurrentException(__PRETTY_FUNCTION__);
wakeup_event.tryWait(10 * 1000);
continue;
}
} while (false);
while (!need_stop && !tryStartup())
wakeup_event.tryWait(10 * 1000);