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

standby tenant can not upgrade

Browse Source
This commit is contained in:
obdev
2023-04-19 03:41:45 +00:00
committed by ob-robot
parent 15bb1eed5c
commit 2e58ca4b43
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/rootserver/ob_recovery_ls_service.cpp
View File

@ -411,7 +411,7 @@ int ObRecoveryLSService::get_min_data_version_(uint64_t &compatible)
SMART_VAR(ObMySQLProxy::MySQLResult, result) { SMART_VAR(ObMySQLProxy::MySQLResult, result) {
uint64_t exec_tenant_id = gen_meta_tenant_id(tenant_id_); uint64_t exec_tenant_id = gen_meta_tenant_id(tenant_id_);
ObSqlString sql; ObSqlString sql;
if (OB_FAIL(sql.assign_fmt("select value from %s where tenant_id = '%lu' and name = 'compatible' ", if (OB_FAIL(sql.assign_fmt("select value as compatible from %s where tenant_id = '%lu' and name = 'compatible' ",
OB_TENANT_PARAMETER_TNAME, tenant_id_))) { OB_TENANT_PARAMETER_TNAME, tenant_id_))) {
LOG_WARN("fail to generate sql", KR(ret), K_(tenant_id)); LOG_WARN("fail to generate sql", KR(ret), K_(tenant_id));
} else if (OB_FAIL(proxy_->read(result, exec_tenant_id, sql.ptr()))) { } else if (OB_FAIL(proxy_->read(result, exec_tenant_id, sql.ptr()))) {
@ -466,7 +466,7 @@ void ObRecoveryLSService::try_tenant_upgrade_end_()
ret = EAGAIN; ret = EAGAIN;
LOG_WARN("data_version not match, run upgrade end later", LOG_WARN("data_version not match, run upgrade end later",
KR(ret), K_(tenant_id), K(target_data_version), K(current_data_version), KR(ret), K_(tenant_id), K(target_data_version), K(current_data_version),
K(DATA_CURRENT_VERSION)); K(DATA_CURRENT_VERSION), K(min_data_version));
} else { } else {
HEAP_VAR(obrpc::ObAdminSetConfigItem, item) { HEAP_VAR(obrpc::ObAdminSetConfigItem, item) {
ObSchemaGetterGuard guard; ObSchemaGetterGuard guard;
@ -496,6 +496,9 @@ void ObRecoveryLSService::try_tenant_upgrade_end_()
LOG_WARN("fail to push back item", KR(ret), K(item)); LOG_WARN("fail to push back item", KR(ret), K(item));
} else if (OB_FAIL(rs_rpc_proxy_->timeout(timeout).admin_set_config(arg))) { } else if (OB_FAIL(rs_rpc_proxy_->timeout(timeout).admin_set_config(arg))) {
LOG_WARN("fail to set config", KR(ret), K(arg), K(timeout)); LOG_WARN("fail to set config", KR(ret), K(arg), K(timeout));
} else {
LOG_INFO("upgrade end", KR(ret), K(arg), K(timeout), K_(tenant_id), K(target_data_version),
K(current_data_version), K(DATA_CURRENT_VERSION), K(min_data_version));
} }
} // end HEAP_VAR } // end HEAP_VAR
} }