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

add tenant schema status check before alter system set tenant config

Browse Source
This commit is contained in:
obdev
2023-02-07 20:17:55 +08:00
committed by ob-robot
parent 12bf4cc0a6
commit 8e2037671b
1 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/rootserver/ob_system_admin_util.cpp
View File

@ -950,61 +950,75 @@ int ObAdminSetConfig::update_config(obrpc::ObAdminSetConfigArg &arg, int64_t new
} else if (item->tenant_ids_.size() > 0) { } else if (item->tenant_ids_.size() > 0) {
// tenant config // tenant config
ObDMLSqlSplicer dml; ObDMLSqlSplicer dml;
for (uint64_t tenant_id : item->tenant_ids_) { share::schema::ObSchemaGetterGuard schema_guard;
const char *table_name = (ObAdminSetConfig::OB_PARAMETER_SEED_ID == tenant_id ? const share::schema::ObSimpleTenantSchema *tenant_schema = NULL;
OB_ALL_SEED_PARAMETER_TNAME : OB_TENANT_PARAMETER_TNAME); if (OB_FAIL(GSCHEMASERVICE.get_tenant_schema_guard(
tenant_id = (ObAdminSetConfig::OB_PARAMETER_SEED_ID == tenant_id ? OB_SYS_TENANT_ID : tenant_id); OB_SYS_TENANT_ID, schema_guard))) {
uint64_t exec_tenant_id = gen_meta_tenant_id(tenant_id); LOG_WARN("fail to get sys tenant schema guard", KR(ret));
dml.reset(); } else {
if (OB_FAIL(dml.add_pk_column("tenant_id", tenant_id)) for (uint64_t tenant_id : item->tenant_ids_) {
|| OB_FAIL(dml.add_pk_column("zone", item->zone_.ptr())) const char *table_name = (ObAdminSetConfig::OB_PARAMETER_SEED_ID == tenant_id ?
|| OB_FAIL(dml.add_pk_column("svr_type", print_server_role(OB_SERVER))) OB_ALL_SEED_PARAMETER_TNAME : OB_TENANT_PARAMETER_TNAME);
|| OB_FAIL(dml.add_pk_column(K(svr_ip))) tenant_id = (ObAdminSetConfig::OB_PARAMETER_SEED_ID == tenant_id ? OB_SYS_TENANT_ID : tenant_id);
|| OB_FAIL(dml.add_pk_column(K(svr_port))) uint64_t exec_tenant_id = gen_meta_tenant_id(tenant_id);
|| OB_FAIL(dml.add_pk_column("name", item->name_.ptr())) dml.reset();
|| OB_FAIL(dml.add_column("data_type", "varchar")) if (OB_FAIL(schema_guard.get_tenant_info(tenant_id, tenant_schema))) {
|| OB_FAIL(dml.add_column("value", item->value_.ptr())) LOG_WARN("failed to get tenant ids", KR(ret), K(tenant_id));
|| OB_FAIL(dml.add_column("info", item->comment_.ptr())) } else if (OB_ISNULL(tenant_schema)) {
|| OB_FAIL(dml.add_column("config_version", new_version))) { ret = OB_TENANT_NOT_EXIST;
LOG_WARN("add column failed", KR(ret)); LOG_WARN("tenant not exist", KR(ret), K(tenant_id));
} else if (OB_FAIL(dml.get_values().append_fmt("usec_to_time(%ld)", new_version))) { } else if (!tenant_schema->is_normal()) {
LOG_WARN("append valued failed", KR(ret)); //tenant not normal, maybe tenant not ready, cannot add tenant config
} else if (OB_FAIL(dml.add_column(false, "gmt_modified"))) { } else if (OB_FAIL(dml.add_pk_column("tenant_id", tenant_id))
LOG_WARN("add column failed", KR(ret)); || OB_FAIL(dml.add_pk_column("zone", item->zone_.ptr()))
} else { || OB_FAIL(dml.add_pk_column("svr_type", print_server_role(OB_SERVER)))
int64_t affected_rows = 0; || OB_FAIL(dml.add_pk_column(K(svr_ip)))
ObDMLExecHelper exec(*ctx_.sql_proxy_, exec_tenant_id); || OB_FAIL(dml.add_pk_column(K(svr_port)))
ObConfigItem *ci = nullptr; || OB_FAIL(dml.add_pk_column("name", item->name_.ptr()))
// tenant not exist in RS, use SYS instead || OB_FAIL(dml.add_column("data_type", "varchar"))
omt::ObTenantConfigGuard tenant_config(TENANT_CONF(OB_SYS_TENANT_ID)); || OB_FAIL(dml.add_column("value", item->value_.ptr()))
if (!tenant_config.is_valid()) { || OB_FAIL(dml.add_column("info", item->comment_.ptr()))
ret = OB_ERR_UNEXPECTED; || OB_FAIL(dml.add_column("config_version", new_version))) {
LOG_WARN("failed to get tenant config",K(tenant_id), KR(ret)); LOG_WARN("add column failed", KR(ret));
} else if (OB_ISNULL(tenant_config->get_container().get( } else if (OB_FAIL(dml.get_values().append_fmt("usec_to_time(%ld)", new_version))) {
ObConfigStringKey(item->name_.ptr())))) { LOG_WARN("append valued failed", KR(ret));
ret = OB_ERR_SYS_CONFIG_UNKNOWN; } else if (OB_FAIL(dml.add_column(false, "gmt_modified"))) {
LOG_WARN("can't found config item", KR(ret), K(tenant_id), "item", *item); LOG_WARN("add column failed", KR(ret));
} else { } else {
ci = *(tenant_config->get_container().get( int64_t affected_rows = 0;
ObConfigStringKey(item->name_.ptr()))); ObDMLExecHelper exec(*ctx_.sql_proxy_, exec_tenant_id);
if (OB_FAIL(dml.add_column("section", ci->section())) ObConfigItem *ci = nullptr;
|| OB_FAIL(dml.add_column("scope", ci->scope())) // tenant not exist in RS, use SYS instead
|| OB_FAIL(dml.add_column("source", ci->source())) omt::ObTenantConfigGuard tenant_config(TENANT_CONF(OB_SYS_TENANT_ID));
|| OB_FAIL(dml.add_column("edit_level", ci->edit_level()))) { if (!tenant_config.is_valid()) {
LOG_WARN("add column failed", KR(ret));
} else if (OB_FAIL(exec.exec_insert_update(table_name,
dml, affected_rows))) {
LOG_WARN("execute insert update failed", K(tenant_id), KR(ret), "item", *item);
} else if (is_zero_row(affected_rows) || affected_rows > 2) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected affected rows", K(tenant_id), K(affected_rows), KR(ret)); LOG_WARN("failed to get tenant config",K(tenant_id), KR(ret));
} else if (OB_ISNULL(tenant_config->get_container().get(
ObConfigStringKey(item->name_.ptr())))) {
ret = OB_ERR_SYS_CONFIG_UNKNOWN;
LOG_WARN("can't found config item", KR(ret), K(tenant_id), "item", *item);
} else {
ci = *(tenant_config->get_container().get(
ObConfigStringKey(item->name_.ptr())));
if (OB_FAIL(dml.add_column("section", ci->section()))
|| OB_FAIL(dml.add_column("scope", ci->scope()))
|| OB_FAIL(dml.add_column("source", ci->source()))
|| OB_FAIL(dml.add_column("edit_level", ci->edit_level()))) {
LOG_WARN("add column failed", KR(ret));
} else if (OB_FAIL(exec.exec_insert_update(table_name,
dml, affected_rows))) {
LOG_WARN("execute insert update failed", K(tenant_id), KR(ret), "item", *item);
} else if (is_zero_row(affected_rows) || affected_rows > 2) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected affected rows", K(tenant_id), K(affected_rows), KR(ret));
}
} }
} }
} if (OB_FAIL(ret)) {
if (OB_FAIL(ret)) { break;
break; }
} } // for
} // for }
} else { } else {
// sys config // sys config
ObDMLSqlSplicer dml; ObDMLSqlSplicer dml;