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

Fix CopyMacroRange in 500 tenant bug.

Browse Source
This commit is contained in:
godyangfight 2023-11-08 15:13:26 +00:00 committed by ob-robot
parent cddec9976a
commit 57b755ea91
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/errsim_module/ob_errsim_module_interface_imp.cpp
View File

@ -35,7 +35,7 @@ int build_tenant_errsim_moulde(
if (OB_INVALID_ID == tmp_tenant_id || config_version < 0) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("build tenant module get invalid argument", K(ret), K(tmp_tenant_id), K(config_version));
} else if (is_virtual_tenant_id(tmp_tenant_id)) {
} else if (is_virtual_tenant_id(tmp_tenant_id) || OB_INVALID_TENANT_ID == tmp_tenant_id) {
//do nothing
} else {
MTL_SWITCH(tmp_tenant_id) {
@ -61,7 +61,7 @@ bool is_errsim_module(
if (OB_INVALID_ID == tmp_tenant_id || !ObErrsimModuleTypeHelper::is_valid(type)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("is errsim module get invalid argument", K(ret), K(tenant_id), K(tmp_tenant_id), K(type));
} else if (is_virtual_tenant_id(tmp_tenant_id)) {
} else if (is_virtual_tenant_id(tmp_tenant_id) || OB_INVALID_TENANT_ID == tmp_tenant_id) {
b_ret = false;
} else if (ObErrsimModuleType::ERRSIM_MODULE_NONE == type) {
b_ret = false;
@ -89,7 +89,7 @@ int add_tenant_errsim_event(
if (OB_INVALID_ID == tmp_tenant_id || !event.is_valid()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("is errsim module get invalid argument", K(ret), K(tmp_tenant_id), K(event));
} else if (is_virtual_tenant_id(tmp_tenant_id)) {
} else if (is_virtual_tenant_id(tmp_tenant_id) || OB_INVALID_TENANT_ID == tmp_tenant_id) {
//do nothing
} else {
MTL_SWITCH(tmp_tenant_id) {

2
src/storage/high_availability/ob_storage_ha_struct.cpp
View File

@ -1194,6 +1194,8 @@ ObCopySSTableMacroRangeInfo::ObCopySSTableMacroRangeInfo()
: copy_table_key_(),
copy_macro_range_array_()
{
lib::ObMemAttr attr(MTL_ID(), "MacroRangeInfo");
copy_macro_range_array_.set_attr(attr);
}
ObCopySSTableMacroRangeInfo::~ObCopySSTableMacroRangeInfo()