Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
大炮V587
oceanbase
提交
9bcdbcde
O
oceanbase
项目概览
大炮V587
/
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,体验更适合开发者的 AI 搜索 >>
提交
9bcdbcde
编写于
3月 22, 2023
作者:
O
obdev
提交者:
ob-robot
3月 22, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[4.1][savepoint] stop rollback to savepoint when trans is terminated
上级
9407bbea
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
27 addition
and
8 deletion
+27
-8
src/storage/tx/ob_tx_api.cpp
src/storage/tx/ob_tx_api.cpp
+13
-2
src/storage/tx/ob_xa_service.cpp
src/storage/tx/ob_xa_service.cpp
+14
-6
未找到文件。
src/storage/tx/ob_tx_api.cpp
浏览文件 @
9bcdbcde
...
@@ -1571,9 +1571,20 @@ inline int ObTransService::sync_rollback_savepoint__(ObTxDesc &tx,
...
@@ -1571,9 +1571,20 @@ inline int ObTransService::sync_rollback_savepoint__(ObTxDesc &tx,
int
rpc_ret
=
OB_SUCCESS
;
int
rpc_ret
=
OB_SUCCESS
;
if
(
OB_FAIL
(
tx
.
rpc_cond_
.
wait
(
waittime
,
rpc_ret
)))
{
if
(
OB_FAIL
(
tx
.
rpc_cond_
.
wait
(
waittime
,
rpc_ret
)))
{
TRANS_LOG
(
WARN
,
"tx rpc condition wakeup"
,
K
(
ret
),
TRANS_LOG
(
WARN
,
"tx rpc condition wakeup"
,
K
(
ret
),
K
(
waittime
),
K
(
rpc_ret
),
K
(
expire_ts
),
K
(
remain
),
K
(
remain_cnt
),
K
(
retries
));
K
(
waittime
),
K
(
rpc_ret
),
K
(
expire_ts
),
K
(
remain
),
K
(
remain_cnt
),
K
(
retries
),
K_
(
tx
.
state
));
// if trans is terminated, rollback savepoint should be terminated
// NOTE that this case is only for xa trans
// EXAMPLE, tx desc is shared by branch 1 and branch 2
// 1. branch 1 starts to rollback savepoint
// 2. branch 2 is terminated
// 3. branch 1 receives callback of rollback savepoint
if
(
tx
.
is_terminated
())
{
ret
=
OB_TRANS_HAS_DECIDED
;
}
else
{
ret
=
OB_SUCCESS
;
ret
=
OB_SUCCESS
;
}
}
}
if
(
OB_SUCCESS
!=
rpc_ret
)
{
if
(
OB_SUCCESS
!=
rpc_ret
)
{
TRANS_LOG
(
WARN
,
"tx rpc fail"
,
K
(
rpc_ret
),
K_
(
tx
.
tx_id
),
K
(
waittime
),
K
(
remain
),
K
(
remain_cnt
),
K
(
retries
));
TRANS_LOG
(
WARN
,
"tx rpc fail"
,
K
(
rpc_ret
),
K_
(
tx
.
tx_id
),
K
(
waittime
),
K
(
remain
),
K
(
remain_cnt
),
K
(
retries
));
if
(
rpc_ret
==
OB_TRANS_CTX_NOT_EXIST
)
{
if
(
rpc_ret
==
OB_TRANS_CTX_NOT_EXIST
)
{
...
...
src/storage/tx/ob_xa_service.cpp
浏览文件 @
9bcdbcde
...
@@ -2209,20 +2209,28 @@ int ObXAService::terminate_to_original_(const ObXATransID &xid,
...
@@ -2209,20 +2209,28 @@ int ObXAService::terminate_to_original_(const ObXATransID &xid,
int
ObXAService
::
xa_rollback_all_changes
(
const
ObXATransID
&
xid
,
ObTxDesc
*&
tx_desc
,
const
int64_t
stmt_expired_time
)
int
ObXAService
::
xa_rollback_all_changes
(
const
ObXATransID
&
xid
,
ObTxDesc
*&
tx_desc
,
const
int64_t
stmt_expired_time
)
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
int
tmp_ret
=
OB_SUCCESS
;
const
int64_t
savepoint
=
1
;
const
int64_t
savepoint
=
1
;
if
(
NULL
==
tx_desc
||
!
tx_desc
->
is_valid
()
||
!
xid
.
is_valid
()
||
stmt_expired_time
<
0
)
{
if
(
NULL
==
tx_desc
||
!
tx_desc
->
is_valid
()
||
!
xid
.
is_valid
()
||
stmt_expired_time
<
0
)
{
ret
=
OB_INVALID_ARGUMENT
;
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"invalid argument"
,
K
(
ret
),
KP
(
tx_desc
),
K
(
xid
),
K
(
stmt_expired_time
));
TRANS_LOG
(
WARN
,
"invalid argument"
,
K
(
ret
),
KP
(
tx_desc
),
K
(
xid
),
K
(
stmt_expired_time
));
}
else
{
}
else
{
ObTransID
tx_id
=
tx_desc
->
get_tx_id
();
if
(
OB_FAIL
(
start_stmt
(
xid
,
0
/*unused session id*/
,
*
tx_desc
)))
{
if
(
OB_FAIL
(
start_stmt
(
xid
,
0
/*unused session id*/
,
*
tx_desc
)))
{
TRANS_LOG
(
WARN
,
"xa start stmt fail"
,
K
(
ret
),
K
(
tx_desc
),
K
(
x
id
));
TRANS_LOG
(
WARN
,
"xa start stmt fail"
,
K
(
ret
),
K
(
xid
),
K
(
tx_
id
));
}
else
if
(
OB_FAIL
(
MTL
(
transaction
::
ObTransService
*
)
->
rollback_to_implicit_savepoint
(
*
tx_desc
,
savepoint
,
stmt_expired_time
,
NULL
)))
{
}
else
{
TRANS_LOG
(
WARN
,
"do savepoint rollback error"
,
K
(
ret
),
K
(
tx_desc
));
if
(
OB_FAIL
(
MTL
(
transaction
::
ObTransService
*
)
->
rollback_to_implicit_savepoint
(
*
tx_desc
,
}
else
if
(
OB_FAIL
(
end_stmt
(
xid
,
*
tx_desc
)))
{
savepoint
,
stmt_expired_time
,
NULL
)))
{
TRANS_LOG
(
WARN
,
"xa start stmt fail"
,
K
(
ret
),
K
(
tx_desc
),
K
(
x
id
));
TRANS_LOG
(
WARN
,
"do savepoint rollback error"
,
K
(
ret
),
K
(
xid
),
K
(
tx_
id
));
}
else
{
}
else
{
TRANS_LOG
(
INFO
,
"xa rollback all changes success"
,
K
(
ret
),
K
(
tx_desc
),
K
(
xid
));
TRANS_LOG
(
INFO
,
"xa rollback all changes success"
,
K
(
ret
),
K
(
xid
),
K
(
tx_id
));
}
if
(
OB_SUCCESS
!=
(
tmp_ret
=
end_stmt
(
xid
,
*
tx_desc
)))
{
// return the error code of end stmt first
ret
=
tmp_ret
;
TRANS_LOG
(
WARN
,
"xa end stmt fail"
,
K
(
ret
),
K
(
xid
),
K
(
tx_id
));
}
}
}
}
}
return
ret
;
return
ret
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录