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

support specifying the tenant id in the -o option

Browse Source
This commit is contained in:
obdev
2023-05-26 10:16:56 +00:00
committed by ob-robot
parent 9077dc1f23
commit 982112f7bc
1 changed files with 58 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/observer/omt/ob_tenant_config.cpp
View File

@ -352,7 +352,7 @@ int ObTenantConfig::add_extra_config(const char *config_str,
const ObString compatible_cfg(COMPATIBLE);
while (OB_SUCC(ret) && OB_LIKELY(NULL != token)) {
char *saveptr_one = NULL;
const char *name = NULL;
char *name = NULL;
const char *value = NULL;
ObConfigItem *const *pp_item = NULL;
if (OB_ISNULL(name = STRTOK_R(token, "=", &saveptr_one))) {
@ -361,52 +361,67 @@ int ObTenantConfig::add_extra_config(const char *config_str,
} else if (OB_ISNULL(saveptr_one) || OB_UNLIKELY('\0' == *(value = saveptr_one))) {
LOG_INFO("Empty config string", K(token), K(name));
// ret = OB_INVALID_CONFIG;
name = "";
name = NULL;
}
if (OB_SUCC(ret)) {
const int value_len = strlen(value);
// hex2cstring -> value_len / 2 + 1
// '\0' -> 1
const int external_info_val_len = value_len / 2 + 1 + 1;
char *external_info_val = (char*)ob_malloc(external_info_val_len, "temp");
DEFER(if (external_info_val != nullptr) ob_free(external_info_val););
if (OB_ISNULL(external_info_val)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to alloc", K(ret));
} else if (FALSE_IT(external_info_val[0] = '\0')) {
} else if (OB_ISNULL(pp_item = container_.get(ObConfigStringKey(name)))) {
/* make compatible with previous configuration */
ret = check_name ? OB_INVALID_CONFIG : OB_SUCCESS;
LOG_WARN("Invalid config string, no such config item", K(name), K(value), K(ret));
}
if (OB_FAIL(ret) || OB_ISNULL(pp_item)) {
} else if (compatible_cfg.case_compare(name) == 0) {
if (!(*pp_item)->set_dump_value(value)) {
ret = OB_INVALID_CONFIG;
LOG_WARN("Invalid config value", K(name), K(value), K(ret));
} else {
(*pp_item)->set_dump_value_updated();
(*pp_item)->set_version(version);
LOG_INFO("Load tenant config dump value succ", K(name), K((*pp_item)->spfile_str()), K((*pp_item)->str()));
}
} else if (check_unit && !(*pp_item)->check_unit(value)) {
ret = OB_INVALID_CONFIG;
LOG_ERROR("Invalid config value", K(name), K(value), K(ret));
if (OB_ISNULL(name)) {
// do nothing, just skip this parameter
} else {
if (!(*pp_item)->set_value(value)) {
ret = OB_INVALID_CONFIG;
LOG_WARN("Invalid config value", K(name), K(value), K(ret));
} else if (!(*pp_item)->check()) {
ret = OB_INVALID_CONFIG;
const char* range = (*pp_item)->range();
if (OB_ISNULL(range) || strlen(range) == 0) {
LOG_ERROR("Invalid config, value out of range", K(name), K(value), K(ret));
} else {
_LOG_ERROR("Invalid config, value out of %s (for reference only). name=%s, value=%s, ret=%d", range, name, value, ret);
}
char curr_tid_str[32] = {'\0'}; // 32 is enougth for uint64_t
snprintf(curr_tid_str, sizeof(curr_tid_str), "%lu", tenant_id_);
char *tid_in_arg = NULL;
name = STRTOK_R(name, "@", &tid_in_arg);
if (OB_ISNULL(name) || OB_UNLIKELY('\0' == *name)) {
// skip this parameter because name is invalid
} else if (OB_NOT_NULL(tid_in_arg) && ('\0' != *tid_in_arg) &&
0 != strcmp(tid_in_arg, curr_tid_str)) {
// skip this parameter because the tenant_id does bot match
} else {
(*pp_item)->set_version(version);
LOG_INFO("Load tenant config succ", K(name), K(value));
const int value_len = strlen(value);
// hex2cstring -> value_len / 2 + 1
// '\0' -> 1
const int external_info_val_len = value_len / 2 + 1 + 1;
char *external_info_val = (char*)ob_malloc(external_info_val_len, "temp");
DEFER(if (external_info_val != nullptr) ob_free(external_info_val););
if (OB_ISNULL(external_info_val)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to alloc", K(ret));
} else if (FALSE_IT(external_info_val[0] = '\0')) {
} else if (OB_ISNULL(pp_item = container_.get(ObConfigStringKey(name)))) {
/* make compatible with previous configuration */
ret = check_name ? OB_INVALID_CONFIG : OB_SUCCESS;
LOG_WARN("Invalid config string, no such config item", K(name), K(value), K(ret));
}
if (OB_FAIL(ret) || OB_ISNULL(pp_item)) {
} else if (compatible_cfg.case_compare(name) == 0) {
if (!(*pp_item)->set_dump_value(value)) {
ret = OB_INVALID_CONFIG;
LOG_WARN("Invalid config value", K(name), K(value), K(ret));
} else {
(*pp_item)->set_dump_value_updated();
(*pp_item)->set_version(version);
LOG_INFO("Load tenant config dump value succ", K(name), K((*pp_item)->spfile_str()), K((*pp_item)->str()));
}
} else if (check_unit && !(*pp_item)->check_unit(value)) {
ret = OB_INVALID_CONFIG;
LOG_ERROR("Invalid config value", K(name), K(value), K(ret));
} else {
if (!(*pp_item)->set_value(value)) {
ret = OB_INVALID_CONFIG;
LOG_WARN("Invalid config value", K(name), K(value), K(ret));
} else if (!(*pp_item)->check()) {
ret = OB_INVALID_CONFIG;
const char* range = (*pp_item)->range();
if (OB_ISNULL(range) || strlen(range) == 0) {
LOG_ERROR("Invalid config, value out of range", K(name), K(value), K(ret));
} else {
_LOG_ERROR("Invalid config, value out of %s (for reference only). name=%s, value=%s, ret=%d", range, name, value, ret);
}
} else {
(*pp_item)->set_version(version);
LOG_INFO("Load tenant config succ", K(name), K(value));
}
}
}
}
token = STRTOK_R(NULL, ",\n", &saveptr);