提交 ce796072 编写于 作者: O obdev 提交者: wangzelin.wzl

fix rs obtest case

上级 8cd6314c
...@@ -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(),
......
...@@ -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;
......
...@@ -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.
先完成此消息的编辑!
想要评论请 注册