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

Merge

Browse Source
This commit is contained in:
Michael Kolupaev 2014-04-03 17:30:21 +04:00
parent b00c303f7d
commit 95fc39c559
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h
View File

@ -28,7 +28,7 @@ public:
: zookeeper(zookeeper_), path_prefix(path_prefix_)
{
/// Создадим вспомогательную эфемерную ноду.
holder_path = zookeeper.create(temp_path + "/abandonable-lock-", "", zkutil::CreateMode::EphemeralSequential);
holder_path = zookeeper.create(temp_path + "/abandonable_lock-", "", zkutil::CreateMode::EphemeralSequential);
/// Запишем в основную ноду путь к вспомогательной.
path = zookeeper.create(path_prefix, holder_path, zkutil::CreateMode::PersistentSequential);

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

@ -419,6 +419,7 @@ void StorageReplicatedMergeTree::queueThread()
try
{
executeLogEntry(entry);
zookeeper.remove(replica_path + "/queue/" + entry.znode_name);
success = true;
}