Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
ce796072
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看板
提交
ce796072
编写于
7月 16, 2021
作者:
O
obdev
提交者:
wangzelin.wzl
7月 16, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix rs obtest case
上级
8cd6314c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
3 deletion
+8
-3
src/rootserver/ob_root_inspection.cpp
src/rootserver/ob_root_inspection.cpp
+2
-1
src/rootserver/ob_root_service.cpp
src/rootserver/ob_root_service.cpp
+2
-1
src/rootserver/ob_schema_history_recycler.cpp
src/rootserver/ob_schema_history_recycler.cpp
+4
-1
未找到文件。
src/rootserver/ob_root_inspection.cpp
浏览文件 @
ce796072
...
@@ -1653,9 +1653,10 @@ int ObForceDropSchemaTask::process()
...
@@ -1653,9 +1653,10 @@ int ObForceDropSchemaTask::process()
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
const
int64_t
FAST_INTERVAL
=
10
*
1000
*
1000
;
// 10s
const
int64_t
FAST_INTERVAL
=
10
*
1000
*
1000
;
// 10s
int64_t
delay
=
ObInspector
::
INSPECT_INTERVAL
;
int64_t
delay
=
ObInspector
::
INSPECT_INTERVAL
;
#ifdef
ERRSIM
#ifdef
DEBUG
delay
=
ObServerConfig
::
get_instance
().
schema_drop_gc_delay_time
;
delay
=
ObServerConfig
::
get_instance
().
schema_drop_gc_delay_time
;
#endif
#endif
ObForceDropSchemaChecker
drop_schema_checker
(
root_service_
,
ObForceDropSchemaChecker
drop_schema_checker
(
root_service_
,
root_service_
.
get_schema_service
(),
root_service_
.
get_schema_service
(),
root_service_
.
get_common_rpc_proxy
(),
root_service_
.
get_common_rpc_proxy
(),
...
...
src/rootserver/ob_root_service.cpp
浏览文件 @
ce796072
...
@@ -2269,9 +2269,10 @@ int ObRootService::schedule_inspector_task()
...
@@ -2269,9 +2269,10 @@ int ObRootService::schedule_inspector_task()
{
{
int
ret
=
OB_SUCCESS
;
int
ret
=
OB_SUCCESS
;
int64_t
inspect_interval
=
ObInspector
::
INSPECT_INTERVAL
;
int64_t
inspect_interval
=
ObInspector
::
INSPECT_INTERVAL
;
#ifdef
ERRSIM
#ifdef
DEBUG
inspect_interval
=
ObServerConfig
::
get_instance
().
schema_drop_gc_delay_time
;
inspect_interval
=
ObServerConfig
::
get_instance
().
schema_drop_gc_delay_time
;
#endif
#endif
int64_t
delay
=
1
*
60
*
1000
*
1000
;
int64_t
delay
=
1
*
60
*
1000
*
1000
;
int64_t
purge_interval
=
GCONF
.
_recyclebin_object_purge_frequency
;
int64_t
purge_interval
=
GCONF
.
_recyclebin_object_purge_frequency
;
int64_t
expire_time
=
GCONF
.
recyclebin_object_expire_time
;
int64_t
expire_time
=
GCONF
.
recyclebin_object_expire_time
;
...
...
src/rootserver/ob_schema_history_recycler.cpp
浏览文件 @
ce796072
...
@@ -473,7 +473,7 @@ int ObSchemaHistoryRecycler::get_recycle_schema_version_by_standby_cluster(
...
@@ -473,7 +473,7 @@ int ObSchemaHistoryRecycler::get_recycle_schema_version_by_standby_cluster(
ret
=
OB_ERR_UNEXPECTED
;
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"schema_status_proxy is null"
,
K
(
ret
));
LOG_WARN
(
"schema_status_proxy is null"
,
K
(
ret
));
}
else
{
}
else
{
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
tenant_ids
.
at
(
i
);
i
++
)
{
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
tenant_ids
.
count
(
);
i
++
)
{
const
uint64_t
tenant_id
=
tenant_ids
.
at
(
i
);
const
uint64_t
tenant_id
=
tenant_ids
.
at
(
i
);
int64_t
recycle_schema_version
=
OB_INVALID_VERSION
;
int64_t
recycle_schema_version
=
OB_INVALID_VERSION
;
ObRefreshSchemaStatus
schema_status
;
ObRefreshSchemaStatus
schema_status
;
...
@@ -660,6 +660,7 @@ int ObSchemaHistoryRecycler::get_recycle_schema_version_by_global_stat(
...
@@ -660,6 +660,7 @@ int ObSchemaHistoryRecycler::get_recycle_schema_version_by_global_stat(
}
}
}
}
if
(
OB_SUCC
(
ret
))
{
if
(
OB_SUCC
(
ret
))
{
// step 4. restore point
int64_t
schema_version
=
0
;
int64_t
schema_version
=
0
;
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
tenant_ids
.
count
();
i
++
)
{
for
(
int64_t
i
=
0
;
OB_SUCC
(
ret
)
&&
i
<
tenant_ids
.
count
();
i
++
)
{
const
uint64_t
tenant_id
=
tenant_ids
.
at
(
i
);
const
uint64_t
tenant_id
=
tenant_ids
.
at
(
i
);
...
@@ -670,6 +671,8 @@ int ObSchemaHistoryRecycler::get_recycle_schema_version_by_global_stat(
...
@@ -670,6 +671,8 @@ int ObSchemaHistoryRecycler::get_recycle_schema_version_by_global_stat(
OB_FAIL
(
fill_recycle_schema_versions
(
tenant_id
,
schema_version
,
recycle_schema_versions
)))
{
OB_FAIL
(
fill_recycle_schema_versions
(
tenant_id
,
schema_version
,
recycle_schema_versions
)))
{
LOG_WARN
(
"fail to fill recycle schema versions"
,
KR
(
ret
),
K
(
tenant_id
),
K
(
schema_version
));
LOG_WARN
(
"fail to fill recycle schema versions"
,
KR
(
ret
),
K
(
tenant_id
),
K
(
schema_version
));
}
}
LOG_INFO
(
"[SCHEMA_RECYCLE] get recycle schema version by restore point"
,
KR
(
ret
),
K
(
tenant_id
),
K
(
schema_version
));
}
}
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录