Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
9ea292d6
O
oceanbase
项目概览
Metz
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ea292d6
编写于
7月 16, 2021
作者:
O
obdev
提交者:
wangzelin.wzl
7月 16, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bug that check response status when broadcast shuffle
上级
9547c883
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
49 addition
and
51 deletion
+49
-51
src/sql/dtl/ob_dtl_basic_channel.cpp
src/sql/dtl/ob_dtl_basic_channel.cpp
+12
-14
src/sql/dtl/ob_dtl_channel_agent.cpp
src/sql/dtl/ob_dtl_channel_agent.cpp
+15
-12
src/sql/dtl/ob_dtl_channel_agent.h
src/sql/dtl/ob_dtl_channel_agent.h
+1
-2
src/sql/dtl/ob_dtl_local_channel.cpp
src/sql/dtl/ob_dtl_local_channel.cpp
+10
-10
src/sql/dtl/ob_dtl_rpc_channel.cpp
src/sql/dtl/ob_dtl_rpc_channel.cpp
+2
-10
src/sql/dtl/ob_dtl_utils.cpp
src/sql/dtl/ob_dtl_utils.cpp
+1
-1
src/sql/engine/px/exchange/ob_px_transmit_op.cpp
src/sql/engine/px/exchange/ob_px_transmit_op.cpp
+8
-2
未找到文件。
src/sql/dtl/ob_dtl_basic_channel.cpp
浏览文件 @
9ea292d6
...
...
@@ -183,6 +183,13 @@ int ObDtlBasicChannel::wait_response()
if
(
OB_FAIL
(
msg_response_
.
wait
()))
{
LOG_WARN
(
"send previous message fail"
,
K
(
ret
));
}
if
(
OB_HASH_NOT_EXIST
==
ret
)
{
if
(
is_drain
())
{
ret
=
OB_SUCCESS
;
}
else
{
ret
=
OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER
;
}
}
}
return
ret
;
}
...
...
@@ -190,10 +197,8 @@ int ObDtlBasicChannel::wait_response()
int
ObDtlBasicChannel
::
clear_response_block
()
{
int
ret
=
OB_SUCCESS
;
if
(
msg_response_
.
is_in_process
())
{
if
(
OB_FAIL
(
msg_response_
.
wait
()))
{
LOG_WARN
(
"send previous message fail"
,
K
(
ret
));
}
if
(
OB_FAIL
(
wait_response
()))
{
LOG_WARN
(
"failed to wait response"
,
K
(
ret
));
}
msg_response_
.
reset_block
();
return
ret
;
...
...
@@ -684,7 +689,7 @@ int ObDtlBasicChannel::send1(std::function<int(const ObDtlLinkedBuffer&)>& proc,
return
ret
;
}
int
ObDtlBasicChannel
::
flush
(
bool
force_flush
,
bool
wait_resp
onse
)
int
ObDtlBasicChannel
::
flush
(
bool
force_flush
,
bool
wait_resp
)
{
int
ret
=
OB_SUCCESS
;
if
(
force_flush
==
true
)
{
...
...
@@ -724,18 +729,11 @@ int ObDtlBasicChannel::flush(bool force_flush, bool wait_response)
}
}
while
(
OB_SUCC
(
ret
));
}
if
(
OB_SUCC
(
ret
)
&&
force_flush
&&
wait_resp
onse
&&
msg_response_
.
is_in_process
()
)
{
if
(
OB_FAIL
(
msg_response_
.
wait
()))
{
if
(
OB_SUCC
(
ret
)
&&
force_flush
&&
wait_resp
)
{
if
(
OB_FAIL
(
wait_response
()))
{
LOG_WARN
(
"send previous message fail"
,
K
(
ret
),
K
(
peer_
),
K
(
peer_id_
),
K
(
lbt
()));
}
}
if
(
OB_HASH_NOT_EXIST
==
ret
)
{
if
(
is_drain
())
{
ret
=
OB_SUCCESS
;
}
else
{
ret
=
OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER
;
}
}
return
ret
;
}
...
...
src/sql/dtl/ob_dtl_channel_agent.cpp
浏览文件 @
9ea292d6
...
...
@@ -429,23 +429,26 @@ int ObDtlChanAgent::send_last_buffer(ObDtlLinkedBuffer*& last_buffer)
return
ret
;
}
void
ObDtlChanAgent
::
destroy
()
int
ObDtlChanAgent
::
destroy
()
{
int
ret
=
OB_SUCCESS
;
if
(
nullptr
!=
bcast_channel_
&&
nullptr
!=
current_buffer_
)
{
dtl_buf_allocator_
.
free_buf
(
*
bcast_channel_
,
current_buffer_
);
}
for
(
int64_t
i
=
0
;
i
<
bc_services_
.
count
();
++
i
)
{
common
::
ObArray
<
SendMsgResponse
*>&
resp
=
bc_services_
.
at
(
i
)
->
resps_
;
for
(
int64_t
j
=
0
;
j
<
resp
.
count
();
++
j
)
{
if
(
OB_ISNULL
(
resp
.
at
(
j
)))
{
LOG_WARN
(
"response is null"
);
}
else
if
(
resp
.
at
(
j
)
->
is_in_process
())
{
int
temp_ret
=
resp
.
at
(
j
)
->
wait
();
for
(
int64_t
i
=
0
;
i
<
local_channels_
.
count
();
++
i
)
{
int
temp_ret
=
local_channels_
.
at
(
i
)
->
wait_response
();
if
(
OB_SUCCESS
!=
temp_ret
)
{
LOG_WARN
(
"send previous message fail"
,
K
(
temp_ret
));
ret
=
temp_ret
;
}
}
for
(
int64_t
i
=
0
;
i
<
rpc_channels_
.
count
();
++
i
)
{
int
temp_ret
=
rpc_channels_
.
at
(
i
)
->
wait_response
();
if
(
OB_SUCCESS
!=
temp_ret
)
{
ret
=
temp_ret
;
}
}
for
(
int64_t
i
=
0
;
i
<
bc_services_
.
count
();
++
i
)
{
bc_services_
.
at
(
i
)
->~
ObDtlBcastService
();
}
return
ret
;
}
src/sql/dtl/ob_dtl_channel_agent.h
浏览文件 @
9ea292d6
...
...
@@ -147,8 +147,7 @@ public:
int
flush
();
int
init
(
dtl
::
ObDtlFlowControl
&
dfc
,
ObPxTaskChSet
&
task_ch_set
,
common
::
ObIArray
<
ObDtlChannel
*>&
channels
,
int64_t
tenant_id
,
int64_t
timeout_ts
);
void
destroy
();
int
destroy
();
private:
int
switch_buffer
(
int64_t
need_size
);
int
send_last_buffer
(
ObDtlLinkedBuffer
*&
last_buffer
);
...
...
src/sql/dtl/ob_dtl_local_channel.cpp
浏览文件 @
9ea292d6
...
...
@@ -169,16 +169,8 @@ int ObDtlLocalChannel::send_message(ObDtlLinkedBuffer*& buf)
ret
=
OB_INVALID_ARGUMENT
;
LOG_WARN
(
"invalid argument"
,
K
(
ret
));
}
else
{
if
(
msg_response_
.
is_in_process
())
{
if
(
OB_FAIL
(
msg_response_
.
wait
()))
{
LOG_WARN
(
"send previous message fail"
,
K
(
ret
));
}
else
if
(
OB_HASH_NOT_EXIST
==
ret
)
{
if
(
is_drain
())
{
ret
=
OB_SUCCESS
;
}
else
{
ret
=
OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER
;
}
}
if
(
OB_FAIL
(
wait_response
()))
{
LOG_WARN
(
"failed to wait response"
,
K
(
ret
));
}
if
(
OB_SUCC
(
ret
)
&&
OB_FAIL
(
wait_unblocking_if_blocked
()))
{
LOG_WARN
(
"failed to block data flow"
,
K
(
ret
));
...
...
@@ -206,6 +198,14 @@ int ObDtlLocalChannel::send_message(ObDtlLinkedBuffer*& buf)
set_eof
();
}
}
// it may return 4201 after send_message and it don't call wait_response
if
(
OB_HASH_NOT_EXIST
==
ret
)
{
if
(
is_drain
())
{
ret
=
OB_SUCCESS
;
}
else
{
ret
=
OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER
;
}
}
return
ret
;
}
...
...
src/sql/dtl/ob_dtl_rpc_channel.cpp
浏览文件 @
9ea292d6
...
...
@@ -238,16 +238,8 @@ int ObDtlRpcChannel::send_message(ObDtlLinkedBuffer*& buf)
is_first
=
buf
->
is_data_msg
()
&&
1
==
buf
->
seq_no
();
is_eof
=
buf
->
is_eof
();
if
(
msg_response_
.
is_in_process
())
{
if
(
OB_FAIL
(
msg_response_
.
wait
()))
{
LOG_WARN
(
"send previous message fail"
,
K
(
ret
));
}
else
if
(
OB_HASH_NOT_EXIST
==
ret
)
{
if
(
is_drain
())
{
ret
=
OB_SUCCESS
;
}
else
{
ret
=
OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER
;
}
}
if
(
OB_FAIL
(
wait_response
()))
{
LOG_WARN
(
"failed to wait for response"
,
K
(
ret
));
}
if
(
OB_SUCC
(
ret
)
&&
OB_FAIL
(
wait_unblocking_if_blocked
()))
{
LOG_WARN
(
"failed to block data flow"
,
K
(
ret
));
...
...
src/sql/dtl/ob_dtl_utils.cpp
浏览文件 @
9ea292d6
...
...
@@ -110,7 +110,7 @@ int ObDtlAsynSender::asyn_send()
if
(
OB_FAIL
(
syn_send
()))
{
LOG_WARN
(
"failed to syn send message"
,
K
(
ret
));
}
LOG_
ERROR
(
"failed to calc batch buffer cnt"
,
K
(
ret
));
LOG_
TRACE
(
"failed to calc batch buffer cnt"
,
K
(
ret
));
}
else
{
dtl
::
ObDtlChannel
*
ch
=
NULL
;
int
tmp_ret
=
OB_SUCCESS
;
...
...
src/sql/engine/px/exchange/ob_px_transmit_op.cpp
浏览文件 @
9ea292d6
...
...
@@ -252,7 +252,9 @@ int ObPxTransmitOp::inner_close()
{
int
ret
=
OB_SUCCESS
;
/* we must release channel even if there is some error happen before */
chs_agent_
.
destroy
();
if
(
OB_FAIL
(
chs_agent_
.
destroy
()))
{
LOG_WARN
(
"failed to destroy ch agent"
,
K
(
ret
));
}
ObDtlBasicChannel
*
ch
=
nullptr
;
int64_t
recv_cnt
=
0
;
for
(
int
i
=
0
;
i
<
task_channels_
.
count
();
++
i
)
{
...
...
@@ -271,7 +273,11 @@ int ObPxTransmitOp::inner_close()
if
(
release_channel_ret
!=
common
::
OB_SUCCESS
)
{
LOG_WARN
(
"release dtl channel failed"
,
K
(
release_channel_ret
));
}
if
(
OB_FAIL
(
ObTransmitOp
::
inner_close
()))
{
int
tmp_ret
=
OB_SUCCESS
;
if
(
OB_SUCCESS
!=
(
tmp_ret
=
ObTransmitOp
::
inner_close
()))
{
if
(
OB_SUCC
(
ret
))
{
ret
=
tmp_ret
;
}
LOG_WARN
(
"fail close op"
,
K
(
ret
));
}
return
ret
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录