hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix the bug of last purge scn in creating mlog

Browse Source
This commit is contained in:
leftgeek 2023-12-22 18:17:36 +00:00 committed by ob-robot
parent 6a3e8c97d4
commit c48e72c56e
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/rootserver/ddl_task/ob_index_build_task.cpp
View File

@ -21,6 +21,8 @@
#include "share/ob_ddl_sim_point.h"
#include "rootserver/ob_root_service.h"
#include "share/scn.h"
#include "share/schema/ob_mlog_info.h"
#include "lib/mysqlclient/ob_mysql_transaction.h"
using namespace oceanbase::rootserver;
using namespace oceanbase::common;
@ -1309,6 +1311,9 @@ int ObIndexBuildTask::enable_index()
ret = OB_ERR_UNEXPECTED;
LOG_WARN("index status not match", K(ret), K(index_table_id_), K(index_status));
}
} else if ((ObIndexArg::ADD_MLOG == create_index_arg_.index_action_type_)
&& OB_FAIL(update_mlog_last_purge_scn())) {
LOG_WARN("failed to update mlog last purge scn", KR(ret));
} else if (OB_FAIL(update_index_status_in_schema(*index_schema, INDEX_STATUS_AVAILABLE))) {
LOG_WARN("fail to try notify index take effect", K(ret), K(index_table_id_));
} else {
@ -1695,3 +1700,39 @@ int64_t ObIndexBuildTask::get_serialize_param_size() const
+ ObDDLTask::get_serialize_param_size()
+ serialization::encoded_length_i64(target_cg_cnt_);
}
int ObIndexBuildTask::update_mlog_last_purge_scn()
{
int ret = OB_SUCCESS;
if (OB_ISNULL(GCTX.sql_proxy_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("sql proxy is null", KR(ret));
} else {
ObMySQLTransaction trans;
ObMLogInfo mlog_info;
if (OB_FAIL(trans.start(GCTX.sql_proxy_, tenant_id_))) {
LOG_WARN("failed to start trans", KR(ret), K_(tenant_id));
} else if (OB_FAIL(ObMLogInfo::fetch_mlog_info(trans,
tenant_id_, index_table_id_, mlog_info, true/*for_update*/))) {
LOG_WARN("failed to fetch mlog info", KR(ret));
} else {
mlog_info.set_last_purge_scn(snapshot_version_);
mlog_info.set_last_purge_date(ObTimeUtility::current_time());
mlog_info.set_last_purge_time(0);
mlog_info.set_last_purge_rows(0);
if (OB_FAIL(mlog_info.set_last_purge_trace_id(ObCurTraceId::get_trace_id_str()))) {
LOG_WARN("failed to set last purge trace id", KR(ret));
} else if (OB_FAIL(ObMLogInfo::update_mlog_last_purge_info(trans, mlog_info))) {
LOG_WARN("failed to update mlog last purge info", KR(ret), K(mlog_info));
}
}
if (trans.is_started()) {
int tmp_ret = OB_SUCCESS;
if (OB_SUCCESS != (tmp_ret = trans.end(OB_SUCC(ret)))) {
LOG_WARN("failed to commit trans", KR(ret), KR(tmp_ret));
ret = OB_SUCC(ret) ? tmp_ret : ret;
}
}
}
return ret;
}

1
src/rootserver/ddl_task/ob_index_build_task.h
View File

@ -149,6 +149,7 @@ private:
bool &need_acquire);
bool is_sstable_complete_task_submitted();
int check_target_cg_cnt();
int update_mlog_last_purge_scn();
private:
static const int64_t OB_INDEX_BUILD_TASK_VERSION = 1;
using ObDDLTask::is_inited_;

6
src/rootserver/ob_ddl_service.cpp
View File

@ -843,9 +843,9 @@ int ObDDLService::add_mlog(
mlog_info.set_tenant_id(tenant_id);
mlog_info.set_mlog_id(mlog_table_id);
mlog_info.set_purge_mode(purge_options.purge_mode_);
mlog_info.set_purge_start(purge_options.start_datetime_expr_.get_timestamp());
mlog_info.set_last_purge_scn(purge_start);
mlog_info.set_last_purge_rows(0);
if (!purge_options.start_datetime_expr_.is_null()) {
mlog_info.set_purge_start(purge_options.start_datetime_expr_.get_timestamp());
}
mlog_info.set_schema_version(mlog_schema.get_schema_version());
if (OB_FAIL(mlog_info.set_purge_next(purge_next))) {
LOG_WARN("fail to set purge next", KR(ret));