From 57b755ea91eb1a0a65b5c068546e3bee5f8029d1 Mon Sep 17 00:00:00 2001
From: godyangfight <godyangfight@gmail.com>
Date: Wed, 8 Nov 2023 15:13:26 +0000
Subject: [PATCH] Fix CopyMacroRange in 500 tenant bug.

---
 src/share/errsim_module/ob_errsim_module_interface_imp.cpp | 6 +++---
 src/storage/high_availability/ob_storage_ha_struct.cpp     | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/share/errsim_module/ob_errsim_module_interface_imp.cpp b/src/share/errsim_module/ob_errsim_module_interface_imp.cpp
index eb281ebd2..c0651e8b8 100644
--- a/src/share/errsim_module/ob_errsim_module_interface_imp.cpp
+++ b/src/share/errsim_module/ob_errsim_module_interface_imp.cpp
@@ -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) {
diff --git a/src/storage/high_availability/ob_storage_ha_struct.cpp b/src/storage/high_availability/ob_storage_ha_struct.cpp
index 82d8f4429..f6560de12 100644
--- a/src/storage/high_availability/ob_storage_ha_struct.cpp
+++ b/src/storage/high_availability/ob_storage_ha_struct.cpp
@@ -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()