Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
soremi
oceanbase
提交
3eef7b05
O
oceanbase
项目概览
soremi
/
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 搜索 >>
提交
3eef7b05
编写于
11月 03, 2022
作者:
O
obdev
提交者:
wangzelin.wzl
11月 03, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix update_merge_status repeatedly report OB_INNER_STAT_ERROR when checksum_error exists
上级
31418623
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
1 deletion
+13
-1
src/rootserver/freeze/ob_major_merge_scheduler.cpp
src/rootserver/freeze/ob_major_merge_scheduler.cpp
+2
-0
src/rootserver/freeze/ob_zone_merge_manager.cpp
src/rootserver/freeze/ob_zone_merge_manager.cpp
+4
-1
src/rootserver/freeze/ob_zone_merge_manager.h
src/rootserver/freeze/ob_zone_merge_manager.h
+1
-0
src/share/ob_zone_merge_info.cpp
src/share/ob_zone_merge_info.cpp
+5
-0
src/share/ob_zone_merge_info.h
src/share/ob_zone_merge_info.h
+1
-0
未找到文件。
src/rootserver/freeze/ob_major_merge_scheduler.cpp
浏览文件 @
3eef7b05
...
...
@@ -657,6 +657,8 @@ int ObMajorMergeScheduler::try_update_global_merged_scn(const int64_t expected_e
LOG_WARN
(
"not inited"
,
KR
(
ret
));
}
else
if
(
OB_FAIL
(
zone_merge_mgr_
->
get_snapshot
(
global_info
,
infos
)))
{
LOG_WARN
(
"fail to get zone info"
,
KR
(
ret
));
}
else
if
(
global_info
.
is_merge_error
())
{
LOG_WARN
(
"should not update global merged scn, cuz is_merge_error is true"
,
K
(
global_info
));
}
else
{
if
(
global_info
.
last_merged_scn_
!=
global_info
.
global_broadcast_scn_
)
{
bool
merged
=
true
;
...
...
src/rootserver/freeze/ob_zone_merge_manager.cpp
浏览文件 @
3eef7b05
...
...
@@ -801,9 +801,12 @@ int ObZoneMergeManagerBase::update_global_merge_info_after_merge(const int64_t e
const
uint64_t
meta_tenant_id
=
gen_meta_tenant_id
(
tenant_id_
);
if
(
OB_FAIL
(
check_inner_stat
()))
{
LOG_WARN
(
"fail to check inner stat"
,
KR
(
ret
),
K_
(
tenant_id
));
}
else
if
(
global_merge_info_
.
is_in_verifying_status
())
{
LOG_INFO
(
"already in verifying status, no need to update global merge status again"
,
K_
(
tenant_id
),
"global merge status"
,
global_merge_info_
.
merge_status_
);
}
else
if
(
global_merge_info_
.
is_merge_error
())
{
ret
=
OB_INNER_STAT_ERROR
;
LOG_WARN
(
"should not
continue checking checksum
, cuz is_merge_error is true"
,
KR
(
ret
),
K_
(
global_merge_info
));
LOG_WARN
(
"should not
update global merge status
, cuz is_merge_error is true"
,
KR
(
ret
),
K_
(
global_merge_info
));
}
else
{
if
(
OB_FAIL
(
trans
.
start
(
proxy_
,
meta_tenant_id
)))
{
LOG_WARN
(
"fail to start transaction"
,
KR
(
ret
),
K_
(
tenant_id
),
K
(
meta_tenant_id
));
...
...
src/rootserver/freeze/ob_zone_merge_manager.h
浏览文件 @
3eef7b05
...
...
@@ -88,6 +88,7 @@ private:
const
common
::
ObIArray
<
share
::
ObZoneMergeInfo
>
&
ori_merge_infos
,
const
common
::
ObIArray
<
common
::
ObZone
>
&
zone_list
,
common
::
ObIArray
<
share
::
ObZoneMergeInfo
>
&
to_insert_infos
);
protected:
common
::
SpinRWLock
lock_
;
static
int
copy_infos
(
ObZoneMergeManagerBase
&
dest
,
const
ObZoneMergeManagerBase
&
src
);
...
...
src/share/ob_zone_merge_info.cpp
浏览文件 @
3eef7b05
...
...
@@ -226,6 +226,11 @@ bool ObGlobalMergeInfo::is_merge_error() const
return
(
is_merge_error_
>
0
);
}
bool
ObGlobalMergeInfo
::
is_in_verifying_status
()
const
{
return
(
ObZoneMergeInfo
::
MERGE_STATUS_VERIFYING
==
merge_status_
);
}
bool
ObGlobalMergeInfo
::
is_valid
()
const
{
bool
is_valid
=
true
;
...
...
src/share/ob_zone_merge_info.h
浏览文件 @
3eef7b05
...
...
@@ -111,6 +111,7 @@ public:
bool
is_in_merge
()
const
;
bool
is_valid
()
const
;
bool
is_merge_error
()
const
;
bool
is_in_verifying_status
()
const
;
ObGlobalMergeInfo
&
operator
=
(
const
ObGlobalMergeInfo
&
other
)
=
delete
;
int
assign
(
const
ObGlobalMergeInfo
&
other
);
// differ from assign, only exclude 'need_update_' copy
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录