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

dbms: quorum inserts: development [#METR-16779].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-09-11 05:51:35 +03:00
parent d53f173478
commit 15a6ac31f4
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
View File

@ -44,23 +44,9 @@ public:
auto live_replicas = zookeeper->getChildren(storage.zookeeper_path + "/leader_election");
if (live_replicas.size() < quorum)
{
String list_of_replicas;
if (live_replicas.empty())
list_of_replicas = "none";
else
{
WriteBufferFromString out(list_of_replicas);
for (auto it = live_replicas.begin(); it != live_replicas.end(); ++it)
out << (it == live_replicas.begin() ? "" : ", ") << *it;
}
throw Exception("Number of alive replicas ("
+ toString(live_replicas.size()) + ") is less than requested quorum ("
+ toString(quorum) + "). Alive replicas: " + list_of_replicas,
+ toString(live_replicas.size()) + ") is less than requested quorum (" + toString(quorum) + ").",
ErrorCodes::TOO_LESS_LIVE_REPLICAS);
}
/** Достигнут ли кворум для последнего куска, для которого нужен кворум?
* Запись всех кусков с включенным кворумом линейно упорядочена.

12
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -1969,7 +1969,11 @@ static void updateQuorum(
/// Кворум достигнут. Удаляем узел.
auto code = zookeeper->tryRemove(quorum_status_path, stat.version);
if (code == ZNONODE)
if (code == ZOK)
{
break;
}
else if (code == ZNONODE)
{
/// Кворум уже был достигнут.
break;
@ -1987,7 +1991,11 @@ static void updateQuorum(
/// Обновляем узел, прописывая туда на одну реплику больше.
auto code = zookeeper->trySet(quorum_status_path, quorum_entry.toString(), stat.version);
if (code == ZNONODE)
if (code == ZOK)
{
break;
}
else if (code == ZNONODE)
{
/// Кворум уже был достигнут.
break;