Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野花太放肆
oceanbase
提交
302ae680
O
oceanbase
项目概览
野花太放肆
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
1
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,发现更多精彩内容 >>
提交
302ae680
编写于
3月 24, 2023
作者:
qq_43633081
提交者:
ob-robot
3月 24, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
forbid scheduling deleted tablet to do restore
上级
7d436f68
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
30 addition
and
0 deletion
+30
-0
src/storage/restore/ob_ls_restore_handler.cpp
src/storage/restore/ob_ls_restore_handler.cpp
+26
-0
src/storage/restore/ob_ls_restore_handler.h
src/storage/restore/ob_ls_restore_handler.h
+1
-0
src/storage/restore/ob_ls_restore_task_mgr.cpp
src/storage/restore/ob_ls_restore_task_mgr.cpp
+3
-0
未找到文件。
src/storage/restore/ob_ls_restore_handler.cpp
浏览文件 @
302ae680
...
...
@@ -591,6 +591,24 @@ int ObLSRestoreHandler::check_tablet_restore_finish_(
return
ret
;
}
int
ObLSRestoreHandler
::
check_tablet_deleted
(
const
ObTabletHandle
&
tablet_handle
,
bool
&
is_deleted
)
{
int
ret
=
OB_SUCCESS
;
// TODO(chongrong.th) need to think about transfer out deleted in 4.2
is_deleted
=
false
;
ObTabletStatus
::
Status
tablet_status
=
ObTabletStatus
::
Status
::
MAX
;
if
(
!
tablet_handle
.
is_valid
())
{
ret
=
OB_INVALID_ARGUMENT
;
LOG_WARN
(
"invalid tablet handle"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
tablet_handle
.
get_obj
()
->
get_tablet_status
(
tablet_status
)))
{
LOG_WARN
(
"failed to get tablet status"
,
K
(
ret
));
}
else
if
(
ObTabletStatus
::
Status
::
DELETED
==
tablet_status
)
{
is_deleted
=
true
;
const
ObTabletID
tablet_id
=
tablet_handle
.
get_obj
()
->
get_tablet_meta
().
tablet_id_
;
LOG_INFO
(
"tablet deleted"
,
K
(
tablet_id
),
K
(
tablet_status
));
}
return
ret
;
}
void
ObLSRestoreHandler
::
wakeup
()
{
int
ret
=
OB_SUCCESS
;
...
...
@@ -983,6 +1001,7 @@ int ObILSRestoreState::reload_tablet_()
}
while
(
OB_SUCC
(
ret
))
{
bool
is_deleted
=
false
;
if
(
OB_FAIL
(
iterator
.
get_next_tablet
(
tablet_handle
)))
{
if
(
OB_ITER_END
==
ret
)
{
ret
=
OB_SUCCESS
;
...
...
@@ -990,6 +1009,9 @@ int ObILSRestoreState::reload_tablet_()
}
else
{
LOG_WARN
(
"fail to get next tablet"
,
K
(
ret
));
}
}
else
if
(
OB_FAIL
(
ObLSRestoreHandler
::
check_tablet_deleted
(
tablet_handle
,
is_deleted
)))
{
LOG_WARN
(
"failed to check tablet need schedule restore"
,
K
(
ret
),
K
(
tablet_handle
));
}
else
if
(
is_deleted
)
{
}
else
if
(
OB_ISNULL
(
tablet
=
tablet_handle
.
get_obj
()))
{
ret
=
OB_INVALID_ARGUMENT
;
LOG_WARN
(
"tablet is nullptr"
,
K
(
ret
));
...
...
@@ -1082,6 +1104,7 @@ int ObILSRestoreState::upload_wait_restore_tablet_()
bool
is_finish
=
false
;
while
(
OB_SUCC
(
ret
))
{
is_finish
=
false
;
bool
is_deleted
=
false
;
if
(
OB_FAIL
(
iterator
.
get_next_tablet
(
tablet_handle
)))
{
if
(
OB_ITER_END
==
ret
)
{
ret
=
OB_SUCCESS
;
...
...
@@ -1089,6 +1112,9 @@ int ObILSRestoreState::upload_wait_restore_tablet_()
}
else
{
LOG_WARN
(
"fail to get next tablet"
,
K
(
ret
));
}
}
else
if
(
OB_FAIL
(
ObLSRestoreHandler
::
check_tablet_deleted
(
tablet_handle
,
is_deleted
)))
{
LOG_WARN
(
"failed to check tablet need schedule restore"
,
K
(
ret
),
K
(
tablet_handle
));
}
else
if
(
is_deleted
)
{
}
else
if
(
nullptr
==
(
tablet
=
tablet_handle
.
get_obj
()))
{
ret
=
OB_INVALID_ARGUMENT
;
LOG_WARN
(
"tablet is nullptr"
,
K
(
ret
));
...
...
src/storage/restore/ob_ls_restore_handler.h
浏览文件 @
302ae680
...
...
@@ -85,6 +85,7 @@ public:
const
share
::
ObLSRestoreStatus
&
leader_restore_status
,
const
int64_t
leader_proposal_id
);
static
int
check_tablet_restore_finish_
(
const
share
::
ObLSRestoreStatus
&
ls_restore_status
,
const
ObTabletMeta
&
tablet_meta
,
bool
&
is_finish
);
static
int
check_tablet_deleted
(
const
ObTabletHandle
&
tablet_handle
,
bool
&
is_deleted
);
void
wakeup
();
void
stop
()
{
ATOMIC_STORE
(
&
is_stop_
,
true
);
}
// when remove ls, set this
int
safe_to_destroy
(
bool
&
is_safe
);
...
...
src/storage/restore/ob_ls_restore_task_mgr.cpp
浏览文件 @
302ae680
...
...
@@ -392,6 +392,9 @@ int ObLSRestoreTaskMgr::check_tablet_deleted_or_restored_(storage::ObLS &ls, con
}
else
if
(
nullptr
==
(
tablet
=
tablet_handle
.
get_obj
()))
{
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"nullptr tablet"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
ObLSRestoreHandler
::
check_tablet_deleted
(
tablet_handle
,
is_deleted
)))
{
LOG_WARN
(
"failed to check tablet deleted"
,
K
(
ret
),
K
(
tablet_handle
));
}
else
if
(
is_deleted
)
{
// do nothing
}
else
{
const
ObTabletMeta
&
tablet_meta
=
tablet
->
get_tablet_meta
();
if
(
OB_FAIL
(
ObLSRestoreHandler
::
check_tablet_restore_finish_
(
ls_restore_status
,
tablet_meta
,
is_restored
)))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录