From 53885e9d56acabaeeda60bb5f829cdaa8eceb3a3 Mon Sep 17 00:00:00 2001
From: SidewinderAK47 <1159409893@qq.com>
Date: Tue, 29 Oct 2024 09:18:03 +0000
Subject: [PATCH] table recovery and backup config compat check.

---
 src/storage/backup/ob_backup_data_store.cpp | 31 +++++++++++++++++++--
 src/storage/backup/ob_backup_data_store.h   | 26 +++++++++--------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/storage/backup/ob_backup_data_store.cpp b/src/storage/backup/ob_backup_data_store.cpp
index 986d729e5..37b7c668d 100644
--- a/src/storage/backup/ob_backup_data_store.cpp
+++ b/src/storage/backup/ob_backup_data_store.cpp
@@ -79,6 +79,8 @@ bool ObBackupDeletedTabletToLSDesc::is_valid() const
 /*
  *------------------------------ObBackupResourcePool----------------------------------------
  */
+OB_SERIALIZE_MEMBER(ObBackupResourcePool, resource_pool_, unit_config_);
+
 int ObBackupResourcePool::assign(const ObBackupResourcePool &that)
 {
   int ret = OB_SUCCESS;
@@ -90,11 +92,32 @@ int ObBackupResourcePool::assign(const ObBackupResourcePool &that)
   return ret;
 }
 
+int ObBackupResourcePool::set(const share::ObResourcePool &resource_pool, const share::ObUnitConfig &unit_config)
+{
+  int ret = OB_SUCCESS;
+  if (!resource_pool.is_valid() || !unit_config.is_valid()) {
+    ret = OB_INVALID_ARGUMENT;
+    LOG_WARN("invalid argument", K(ret), K(resource_pool), K(unit_config));
+  } else if (OB_FAIL(resource_pool_.assign(resource_pool))) {
+    LOG_WARN("failed to assign resource pool", K(ret));
+  } else if (OB_FAIL(unit_config_.assign(unit_config))) {
+    LOG_WARN("failed to assign unit config", K(ret));
+  }
+  return ret;
+}
+
+void ObBackupResourcePool::reset()
+{
+  resource_pool_.reset();
+  unit_config_.reset();
+}
+
 /*
  *------------------------------ObExternTenantLocalityInfo----------------------------
  */
-OB_SERIALIZE_MEMBER(ObExternTenantLocalityInfoDesc, tenant_id_, backup_set_id_, cluster_id_, compat_mode_,
-    tenant_name_, cluster_name_, locality_, primary_zone_, sys_time_zone_, sys_time_zone_wrap_);
+OB_SERIALIZE_MEMBER(ObExternTenantLocalityInfoDesc, tenant_id_, backup_set_id_, cluster_id_,
+  compat_mode_, tenant_name_, cluster_name_, locality_, primary_zone_, sys_time_zone_,
+  sys_time_zone_wrap_, resource_pool_infos_);
 
 bool ObExternTenantLocalityInfoDesc::is_valid() const
 {
@@ -106,6 +129,8 @@ bool ObExternTenantLocalityInfoDesc::is_valid() const
       && !cluster_name_.is_empty()
       && !locality_.is_empty()
       && !primary_zone_.is_empty();
+      /** remove resource_pool_infos empty check for compat previous version
+        * do not include resource_pool_infos. */
 }
 
 int ObExternTenantLocalityInfoDesc::assign(const ObExternTenantLocalityInfoDesc &that)
@@ -114,7 +139,7 @@ int ObExternTenantLocalityInfoDesc::assign(const ObExternTenantLocalityInfoDesc
   if (OB_FAIL(sys_time_zone_wrap_.deep_copy(that.sys_time_zone_wrap_))) {
     LOG_WARN("failed to deep copy", K(ret));
   } else if (OB_FAIL(resource_pool_infos_.assign(that.resource_pool_infos_))) {
-    LOG_WARN("failed to assign resource pool infos", K(ret));
+    LOG_WARN("failed to assign resource pool configs", K(ret));
   } else {
     tenant_id_ = that.tenant_id_;
     backup_set_id_ = that.backup_set_id_;
diff --git a/src/storage/backup/ob_backup_data_store.h b/src/storage/backup/ob_backup_data_store.h
index 7e9bf1824..adcf790ac 100644
--- a/src/storage/backup/ob_backup_data_store.h
+++ b/src/storage/backup/ob_backup_data_store.h
@@ -119,17 +119,19 @@ public:
   bool is_valid() const override { return true; }
 };
 
-struct ObBackupResourcePool
+struct ObBackupResourcePool final
 {
+  OB_UNIS_VERSION(1);
 public:
-    ObBackupResourcePool()
-      : resource_pool_(),
-        unit_config_() {}
-    int assign(const ObBackupResourcePool &that);
-    TO_STRING_KV(K_(resource_pool), K_(unit_config));
-public:
-    share::ObResourcePool resource_pool_;
-    share::ObUnitConfig unit_config_;
+  ObBackupResourcePool()
+    : resource_pool_(),
+      unit_config_() {}
+  int assign(const ObBackupResourcePool &that);
+  int set(const share::ObResourcePool &resource_pool, const share::ObUnitConfig &unit_config);
+  void reset();
+  TO_STRING_KV(K_(resource_pool), K_(unit_config));
+  share::ObResourcePool resource_pool_;
+  share::ObUnitConfig unit_config_;
 };
 
 struct ObExternTenantLocalityInfoDesc final : public ObExternBackupDataDesc
@@ -159,9 +161,9 @@ public:
   virtual ~ObExternTenantLocalityInfoDesc() {}
   int assign(const ObExternTenantLocalityInfoDesc &that);
   bool is_valid() const override;
-  INHERIT_TO_STRING_KV("ObExternBackupDataDesc", ObExternBackupDataDesc, K_(tenant_id), K_(backup_set_id), K_(cluster_id), 
-      K_(compat_mode), K_(tenant_name), K_(cluster_name), K_(locality), K_(primary_zone), K_(sys_time_zone),
-      K_(sys_time_zone_wrap));
+  INHERIT_TO_STRING_KV("ObExternBackupDataDesc", ObExternBackupDataDesc, K_(tenant_id),
+    K_(backup_set_id), K_(cluster_id), K_(compat_mode), K_(tenant_name), K_(cluster_name),
+    K_(locality), K_(primary_zone), K_(sys_time_zone), K_(sys_time_zone_wrap), K_(resource_pool_infos));
 public:
   uint64_t tenant_id_;
   int64_t backup_set_id_;