Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
7b62758d
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b62758d
编写于
6月 04, 2014
作者:
P
Pavel Kartavyy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dbms: fix to compability with new zkutil
上级
07861aca
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
dbms/include/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h
...nclude/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h
+1
-1
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+10
-10
未找到文件。
dbms/include/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h
浏览文件 @
7b62758d
...
...
@@ -90,7 +90,7 @@ public:
/// Если вспомогательной ноды нет, нужно еще раз проверить существование основной ноды,
/// потому что за это время могли успеть вызвать unlock().
/// Заодно уберем оттуда путь к вспомогательной ноде.
if
(
zookeeper
.
trySet
(
path
,
""
)
==
zkutil
::
ReturnCode
::
Ok
)
if
(
zookeeper
.
trySet
(
path
,
""
)
==
ZOK
)
return
ABANDONED
;
return
UNLOCKED
;
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
7b62758d
...
...
@@ -325,7 +325,7 @@ void StorageReplicatedMergeTree::activateReplica()
}
catch
(
zkutil
::
KeeperException
&
e
)
{
if
(
e
.
code
==
zkutil
::
ReturnCode
::
NodeExists
)
if
(
e
.
code
==
ZNODEEXISTS
)
throw
Exception
(
"Replica "
+
replica_path
+
" appears to be already active. If you're sure it's not, "
"try again in a minute or remove znode "
+
replica_path
+
"/is_active manually"
,
ErrorCodes
::
REPLICA_IS_ALREADY_ACTIVE
);
...
...
@@ -508,9 +508,9 @@ void StorageReplicatedMergeTree::clearOldParts()
zkutil
::
Ops
ops
;
ops
.
push_back
(
new
zkutil
::
Op
::
Remove
(
replica_path
+
"/parts/"
+
name
+
"/checksums"
,
-
1
));
ops
.
push_back
(
new
zkutil
::
Op
::
Remove
(
replica_path
+
"/parts/"
+
name
,
-
1
));
zkutil
::
ReturnCode
::
type
code
=
zookeeper
->
tryMulti
(
ops
);
if
(
code
!=
zkutil
::
ReturnCode
::
Ok
)
LOG_WARNING
(
log
,
"Couldn't remove part "
<<
name
<<
" from ZooKeeper: "
<<
zkutil
::
ReturnCode
::
toS
tring
(
code
));
int32_t
code
=
zookeeper
->
tryMulti
(
ops
);
if
(
code
!=
ZOK
)
LOG_WARNING
(
log
,
"Couldn't remove part "
<<
name
<<
" from ZooKeeper: "
<<
zkutil
::
ZooKeeper
::
error2s
tring
(
code
));
}
if
(
!
parts
.
empty
())
...
...
@@ -552,7 +552,7 @@ void StorageReplicatedMergeTree::clearOldBlocks()
if
(
!
zookeeper
->
exists
(
zookeeper_path
+
"/blocks"
,
&
stat
))
throw
Exception
(
zookeeper_path
+
"/blocks doesn't exist"
,
ErrorCodes
::
NOT_FOUND_NODE
);
int
children_count
=
stat
.
getnumChildren
()
;
int
children_count
=
stat
.
numChildren
;
/// Чтобы делать "асимптотически" меньше запросов exists, будем ждать, пока накопятся в 1.1 раза больше блоков, чем нужно.
if
(
static_cast
<
double
>
(
children_count
)
<
data
.
settings
.
replicated_deduplication_window
*
1.1
)
...
...
@@ -569,7 +569,7 @@ void StorageReplicatedMergeTree::clearOldBlocks()
{
zkutil
::
Stat
stat
;
zookeeper
->
exists
(
zookeeper_path
+
"/blocks/"
+
block
,
&
stat
);
timed_blocks
.
push_back
(
std
::
make_pair
(
stat
.
getczxid
()
,
block
));
timed_blocks
.
push_back
(
std
::
make_pair
(
stat
.
czxid
,
block
));
}
std
::
sort
(
timed_blocks
.
begin
(),
timed_blocks
.
end
(),
std
::
greater
<
std
::
pair
<
Int64
,
String
>>
());
...
...
@@ -629,7 +629,7 @@ void StorageReplicatedMergeTree::pullLogsToQueue()
zkutil
::
Stat
stat
;
if
(
!
zookeeper
.
tryGet
(
zookeeper_path
+
"/replicas/"
+
replica
+
"/log/log-"
+
index_str
,
entry_str
,
&
stat
))
return
false
;
timestamp
=
stat
.
getczxid
()
;
timestamp
=
stat
.
czxid
;
return
true
;
}
};
...
...
@@ -684,7 +684,7 @@ void StorageReplicatedMergeTree::pullLogsToQueue()
replica_path
+
"/log_pointers/"
+
iterator
.
replica
,
toString
(
iterator
.
index
+
1
),
-
1
));
auto
results
=
zookeeper
->
multi
(
ops
);
String
path_created
=
dynamic_cast
<
zkutil
::
Op
Result
::
Create
&>
((
*
results
)
[
0
]).
getPathCreated
();
String
path_created
=
dynamic_cast
<
zkutil
::
Op
::
Create
&>
(
ops
[
0
]).
getPathCreated
();
entry
.
znode_name
=
path_created
.
substr
(
path_created
.
find_last_of
(
'/'
)
+
1
);
entry
.
addResultToVirtualParts
(
*
this
);
queue
.
push_back
(
entry
);
...
...
@@ -933,9 +933,9 @@ void StorageReplicatedMergeTree::queueThread()
executeLogEntry
(
entry
);
auto
code
=
zookeeper
->
tryRemove
(
replica_path
+
"/queue/"
+
entry
.
znode_name
);
if
(
code
!=
zkutil
::
ReturnCode
::
Ok
)
if
(
code
!=
ZOK
)
LOG_ERROR
(
log
,
"Couldn't remove "
<<
replica_path
+
"/queue/"
+
entry
.
znode_name
<<
": "
<<
zkutil
::
ReturnCode
::
toS
tring
(
code
)
+
". There must be a bug somewhere. Ignoring it."
);
<<
zkutil
::
ZooKeeper
::
error2s
tring
(
code
)
+
". There must be a bug somewhere. Ignoring it."
);
success
=
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录