Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
caoersss
oceanbase
提交
a5c703ac
O
oceanbase
项目概览
caoersss
/
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,发现更多精彩内容 >>
提交
a5c703ac
编写于
3月 17, 2022
作者:
T
ts0
提交者:
LINGuanRen
3月 17, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[opensource][XA] fix some cases for white scan
上级
996696c5
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
16 addition
and
3 deletion
+16
-3
src/storage/transaction/ob_trans_sche_ctx.h
src/storage/transaction/ob_trans_sche_ctx.h
+2
-0
src/storage/transaction/ob_xa_rpc.h
src/storage/transaction/ob_xa_rpc.h
+7
-0
src/storage/transaction/ob_xa_trans_heartbeat_worker.h
src/storage/transaction/ob_xa_trans_heartbeat_worker.h
+1
-1
src/storage/transaction/ob_xa_trans_service.cpp
src/storage/transaction/ob_xa_trans_service.cpp
+6
-2
未找到文件。
src/storage/transaction/ob_trans_sche_ctx.h
浏览文件 @
a5c703ac
...
...
@@ -35,6 +35,8 @@ typedef common::ObList<common::ObPartitionKey, ObArenaAllocator> ObPartitionList
struct
ObXABranchInfo
{
ObXABranchInfo
()
:
xid_
(),
state_
(
ObXATransState
::
UNKNOWN
),
timeout_seconds_
(
-
1
),
abs_expired_time_
(
-
1
),
addr_
(),
unrespond_msg_cnt_
(
-
1
),
last_hb_ts_
(
-
1
)
{}
virtual
~
ObXABranchInfo
()
{}
...
...
src/storage/transaction/ob_xa_rpc.h
浏览文件 @
a5c703ac
...
...
@@ -35,6 +35,7 @@ class ObXAPrepareRPCRequest {
public:
ObXAPrepareRPCRequest
()
:
trans_id_
(),
xid_
(),
stmt_timeout_
(
-
1
)
{}
~
ObXAPrepareRPCRequest
()
{}
...
...
@@ -68,6 +69,7 @@ class ObXAEndTransRPCRequest {
public:
ObXAEndTransRPCRequest
()
:
trans_id_
(),
xid_
(),
is_rollback_
(
false
),
is_terminated_
(
false
)
{}
~
ObXAEndTransRPCRequest
()
{}
...
...
@@ -112,6 +114,8 @@ class ObXASyncStatusRPCRequest {
public:
ObXASyncStatusRPCRequest
()
:
trans_id_
(),
xid_
(),
sender_
(),
is_new_branch_
(
false
),
is_stmt_pull_
(
false
),
is_tightly_coupled_
(
false
),
pull_trans_desc_
(
false
),
timeout_seconds_
(
-
1
)
{}
~
ObXASyncStatusRPCRequest
()
{}
...
...
@@ -177,6 +181,7 @@ class ObXASyncStatusRPCResponse {
public:
ObXASyncStatusRPCResponse
()
:
trans_desc_
(),
is_stmt_pull_
(
false
)
{}
~
ObXASyncStatusRPCResponse
()
{}
...
...
@@ -205,6 +210,7 @@ class ObXAMergeStatusRPCRequest {
public:
ObXAMergeStatusRPCRequest
()
:
trans_desc_
(),
is_stmt_push_
(
false
),
is_tightly_coupled_
(
false
),
xid_
(),
seq_no_
(
-
1
)
{}
~
ObXAMergeStatusRPCRequest
()
{}
...
...
@@ -249,6 +255,7 @@ class ObXAHbRequest {
public:
ObXAHbRequest
()
:
trans_id_
(),
xid_
(),
sender_
()
{}
~
ObXAHbRequest
()
{}
...
...
src/storage/transaction/ob_xa_trans_heartbeat_worker.h
浏览文件 @
a5c703ac
...
...
@@ -22,7 +22,7 @@ class ObTransService;
class
ObXATransHeartbeatWorker
:
public
share
::
ObThreadPool
{
public:
ObXATransHeartbeatWorker
()
:
is_inited_
(
false
),
is_running_
(
false
)
ObXATransHeartbeatWorker
()
:
is_inited_
(
false
),
is_running_
(
false
)
,
trans_service_
(
NULL
)
{}
~
ObXATransHeartbeatWorker
()
{
...
...
src/storage/transaction/ob_xa_trans_service.cpp
浏览文件 @
a5c703ac
...
...
@@ -2444,7 +2444,6 @@ int ObTransService::insert_xa_lock(
char
trans_id_buf
[
512
];
trans_id
.
to_string
(
trans_id_buf
,
512
);
char
scheduler_ip_buf
[
128
];
self_
.
ip_to_string
(
scheduler_ip_buf
,
128
);
char
gtrid_str
[
128
];
int64_t
gtrid_len
=
0
;
char
bqual_str
[
128
];
...
...
@@ -2455,6 +2454,9 @@ int ObTransService::insert_xa_lock(
if
(
!
is_valid_tenant_id
(
tenant_id
)
||
xid
.
empty
()
||
!
trans_id
.
is_valid
())
{
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"invalid argument"
,
K
(
ret
),
K
(
tenant_id
),
K
(
xid
),
K
(
trans_id
));
}
else
if
(
!
self_
.
ip_to_string
(
scheduler_ip_buf
,
128
))
{
ret
=
OB_ERR_UNEXPECTED
;
TRANS_LOG
(
WARN
,
"fail to get string of self address"
,
K
(
ret
),
K_
(
self
));
}
else
if
(
OB_FAIL
(
hex_print
(
xid
.
get_gtrid_str
().
ptr
(),
xid
.
get_gtrid_str
().
length
(),
gtrid_str
,
128
,
gtrid_len
)))
{
TRANS_LOG
(
WARN
,
"fail to convert gtrid to hex"
,
K
(
ret
),
K
(
tenant_id
),
K
(
xid
));
}
else
if
(
OB_FAIL
(
sql
.
assign_fmt
(
INSERT_XA_LOCK_SQL
,
...
...
@@ -2508,7 +2510,6 @@ int ObTransService::insert_xa_record(const uint64_t tenant_id, const ObXATransID
char
trans_id_buf
[
512
];
trans_id
.
to_string
(
trans_id_buf
,
512
);
char
scheduler_ip_buf
[
128
];
sche_addr
.
ip_to_string
(
scheduler_ip_buf
,
128
);
char
gtrid_str
[
128
];
int64_t
gtrid_len
=
0
;
char
bqual_str
[
128
];
...
...
@@ -2519,6 +2520,9 @@ int ObTransService::insert_xa_record(const uint64_t tenant_id, const ObXATransID
if
(
!
is_valid_tenant_id
(
tenant_id
)
||
xid
.
empty
()
||
!
trans_id
.
is_valid
())
{
ret
=
OB_INVALID_ARGUMENT
;
TRANS_LOG
(
WARN
,
"invalid argument"
,
K
(
ret
),
K
(
tenant_id
),
K
(
xid
),
K
(
trans_id
));
}
else
if
(
!
self_
.
ip_to_string
(
scheduler_ip_buf
,
128
))
{
ret
=
OB_ERR_UNEXPECTED
;
TRANS_LOG
(
WARN
,
"fail to get string of self address"
,
K
(
ret
),
K_
(
self
));
}
else
if
(
OB_FAIL
(
hex_print
(
xid
.
get_gtrid_str
().
ptr
(),
xid
.
get_gtrid_str
().
length
(),
gtrid_str
,
128
,
gtrid_len
)))
{
TRANS_LOG
(
WARN
,
"fail to convert gtrid to hex"
,
K
(
ret
),
K
(
tenant_id
),
K
(
xid
));
}
else
if
(
OB_FAIL
(
hex_print
(
xid
.
get_bqual_str
().
ptr
(),
xid
.
get_bqual_str
().
length
(),
bqual_str
,
128
,
bqual_len
)))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录