Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
1e8b180e
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,发现更多精彩内容 >>
未验证
提交
1e8b180e
编写于
12月 27, 2020
作者:
A
alexey-milovidov
提交者:
GitHub
12月 27, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18522 from ClickHouse/fix_concurrent_bounded_queue_timeout
Fix usage of concurrent bounded queue in test keeper storage
上级
d84f3082
d204ad7e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
9 addition
and
6 deletion
+9
-6
src/Common/ZooKeeper/TestKeeperStorage.cpp
src/Common/ZooKeeper/TestKeeperStorage.cpp
+9
-6
未找到文件。
src/Common/ZooKeeper/TestKeeperStorage.cpp
浏览文件 @
1e8b180e
...
...
@@ -740,11 +740,13 @@ void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & req
request_info
.
session_id
=
session_id
;
request_info
.
response_callback
=
callback
;
/// Put close requests without timeouts
auto
timeout
=
request
->
getOpNum
()
==
Coordination
::
OpNum
::
Close
?
0
:
operation_timeout
.
totalMilliseconds
();
std
::
lock_guard
lock
(
push_request_mutex
);
if
(
!
requests_queue
.
tryPush
(
std
::
move
(
request_info
),
timeout
))
/// Put close requests without timeouts
if
(
request
->
getOpNum
()
==
Coordination
::
OpNum
::
Close
)
requests_queue
.
push
(
std
::
move
(
request_info
));
else
if
(
!
requests_queue
.
tryPush
(
std
::
move
(
request_info
),
operation_timeout
.
totalMilliseconds
()))
throw
Exception
(
"Cannot push request to queue within operation timeout"
,
ErrorCodes
::
TIMEOUT_EXCEEDED
);
}
void
TestKeeperStorage
::
putRequest
(
const
Coordination
::
ZooKeeperRequestPtr
&
request
,
int64_t
session_id
,
ResponseCallback
callback
,
ResponseCallback
watch_callback
)
...
...
@@ -758,10 +760,11 @@ void TestKeeperStorage::putRequest(const Coordination::ZooKeeperRequestPtr & req
if
(
request
->
has_watch
)
request_info
.
watch_callback
=
watch_callback
;
/// Put close requests without timeouts
auto
timeout
=
request
->
getOpNum
()
==
Coordination
::
OpNum
::
Close
?
0
:
operation_timeout
.
totalMilliseconds
();
std
::
lock_guard
lock
(
push_request_mutex
);
if
(
!
requests_queue
.
tryPush
(
std
::
move
(
request_info
),
timeout
))
/// Put close requests without timeouts
if
(
request
->
getOpNum
()
==
Coordination
::
OpNum
::
Close
)
requests_queue
.
push
(
std
::
move
(
request_info
));
else
if
(
!
requests_queue
.
tryPush
(
std
::
move
(
request_info
),
operation_timeout
.
totalMilliseconds
()))
throw
Exception
(
"Cannot push request to queue within operation timeout"
,
ErrorCodes
::
TIMEOUT_EXCEEDED
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录