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

zkutil: try* methods throw exception on connection loss and timeout. [#METR-10202]

Browse Source
This commit is contained in:
Michael Kolupaev 2014-07-18 20:50:51 +04:00
parent 68ff148170
commit 1ca69dcd7b
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/libzkutil/include/zkutil/ZooKeeper.h
View File

@ -73,8 +73,6 @@ public:
* - Нет родителя создаваемой ноды.
* - Родитель эфемерный.
* - Такая нода уже есть.
* - ZCONNECTIONLOSS
* - ZOPERATIONTIMEOUT
* При остальных ошибках бросает исключение.
*/
int32_t tryCreate(const std::string & path, const std::string & data, int32_t mode, std::string & pathCreated);
@ -94,8 +92,6 @@ public:
* - Такой ноды нет.
* - У ноды другая версия.
* - У ноды есть дети.
* - ZCONNECTIONLOSS
* - ZOPERATIONTIMEOUT
*/
int32_t tryRemove(const std::string & path, int32_t version = -1);
/// Если есть проблемы с сетью может сам удалить ноду и вернуть ZNONODE
@ -116,8 +112,6 @@ public:
/** Не бросает исключение при следующих ошибках:
* - Такой ноды нет.
* - У ноды другая версия.
* - ZCONNECTIONLOSS
* - ZOPERATIONTIMEOUT
*/
int32_t trySet(const std::string & path, const std::string & data,
int32_t version = -1, Stat * stat = nullptr);

39
libs/libzkutil/src/ZooKeeper.cpp
View File

@ -214,9 +214,7 @@ int32_t ZooKeeper::tryCreate(const std::string & path, const std::string & data,
if (!( code == ZOK ||
code == ZNONODE ||
code == ZNODEEXISTS ||
code == ZNOCHILDRENFOREPHEMERALS ||
code == ZCONNECTIONLOSS ||
code == ZOPERATIONTIMEOUT))
code == ZNOCHILDRENFOREPHEMERALS))
throw KeeperException(code, path);
return code;
@ -255,16 +253,20 @@ int32_t ZooKeeper::tryRemove(const std::string & path, int32_t version)
if (!( code == ZOK ||
code == ZNONODE ||
code == ZBADVERSION ||
code == ZNOTEMPTY ||
code == ZCONNECTIONLOSS ||
code == ZOPERATIONTIMEOUT))
code == ZNOTEMPTY))
throw KeeperException(code, path);
return code;
}
int32_t ZooKeeper::tryRemoveWithRetries(const std::string & path, int32_t version)
{
return retry(boost::bind(&ZooKeeper::tryRemove, this, boost::ref(path), version));
int32_t code = retry(boost::bind(&ZooKeeper::removeImpl, this, boost::ref(path), version));
if (!( code == ZOK ||
code == ZNONODE ||
code == ZBADVERSION ||
code == ZNOTEMPTY))
throw KeeperException(code, path);
return code;
}
int32_t ZooKeeper::existsImpl(const std::string & path, Stat * stat_, EventPtr watch)
@ -329,10 +331,7 @@ bool ZooKeeper::tryGet(const std::string & path, std::string & res, Stat * stat_
code == ZNONODE))
throw KeeperException(code, path);
if (code == ZOK)
return true;
else
return false;
return code == ZOK;
}
int32_t ZooKeeper::setImpl(const std::string & path, const std::string & data,
@ -360,9 +359,7 @@ int32_t ZooKeeper::trySet(const std::string & path, const std::string & data,
if (!( code == ZOK ||
code == ZNONODE ||
code == ZBADVERSION ||
code == ZCONNECTIONLOSS ||
code == ZOPERATIONTIMEOUT))
code == ZBADVERSION))
throw KeeperException(code, path);
return code;
}
@ -402,16 +399,22 @@ int32_t ZooKeeper::tryMulti(const Ops & ops_, OpResultsPtr * out_results_)
code == ZNODEEXISTS ||
code == ZNOCHILDRENFOREPHEMERALS ||
code == ZBADVERSION ||
code == ZNOTEMPTY ||
code == ZCONNECTIONLOSS ||
code == ZOPERATIONTIMEOUT))
code == ZNOTEMPTY))
throw KeeperException(code);
return code;
}
int32_t ZooKeeper::tryMultiWithRetries(const Ops & ops, OpResultsPtr * out_results)
{
return retry(boost::bind(&ZooKeeper::tryMulti, this, boost::ref(ops), out_results));
int32_t code = retry(boost::bind(&ZooKeeper::multiImpl, this, boost::ref(ops), out_results));
if (!(code == ZOK ||
code == ZNONODE ||
code == ZNODEEXISTS ||
code == ZNOCHILDRENFOREPHEMERALS ||
code == ZBADVERSION ||
code == ZNOTEMPTY))
throw KeeperException(code);
return code;
}
static const int BATCH_SIZE = 100;