fix: preserve fork_info_ in ObTabletMeta migration-update path to prevent standby query hang on fork dst tablet

obdev · footka · ob-robot · commit 204685d515e0 · 2026-03-31T13:10:57.000Z
Co-authored-by: footka &lt;672528926@qq.com&gt;
diff --git a/src/storage/tablet/ob_tablet.cpp b/src/storage/tablet/ob_tablet.cpp
@@ -5714,6 +5714,7 @@ int ObTablet::build_migration_tablet_param(
     mig_tablet_param.is_empty_shell_ = is_empty_shell();
     mig_tablet_param.split_info_ = tablet_meta_.split_info_;
     mig_tablet_param.has_truncate_info_ = tablet_meta_.has_truncate_info_;
+    mig_tablet_param.fork_info_ = tablet_meta_.fork_info_;
 
     if (OB_FAIL(ret)) {
     } else if (OB_FAIL(build_migration_tablet_param_storage_schema(mig_tablet_param))) {
diff --git a/src/storage/tablet/ob_tablet_meta.cpp b/src/storage/tablet/ob_tablet_meta.cpp
@@ -450,6 +450,7 @@ int ObTabletMeta::init(
     extra_medium_info_ = param.extra_medium_info_;
     split_info_ = param.split_info_;
     has_truncate_info_ = param.has_truncate_info_;
+    fork_info_ = param.fork_info_;
     if (param.version_ < ObMigrationTabletParam::PARAM_VERSION_V3) {
       int64_t tmp_pos = 0;
       const ObString &user_data = param.mds_data_.tablet_status_committed_kv_.v_.user_data_;
@@ -624,6 +625,7 @@ int ObTabletMeta::init(
       has_next_tablet_ = old_tablet_meta.has_next_tablet_;
       micro_index_clustered_ = old_tablet_meta.micro_index_clustered_;
       split_info_ = OB_ISNULL(tablet_meta) ? old_tablet_meta.split_info_ : tablet_meta->split_info_; // migration sstables replaces split status.
+      fork_info_ = OB_ISNULL(tablet_meta) ? old_tablet_meta.fork_info_ : tablet_meta->fork_info_;
       if (old_tablet_meta.has_truncate_info_ || (OB_NOT_NULL(tablet_meta) && tablet_meta->has_truncate_info_)) {
         has_truncate_info_ = true;
       }
@@ -1379,6 +1381,8 @@ int ObMigrationTabletParam::serialize(char *buf, const int64_t len, int64_t &pos
     LOG_WARN("failed to serialize split info", K(ret), K(len), K(new_pos), K_(split_info));
   } else if (PARAM_VERSION_V3 <= version_ && new_pos - pos < length && OB_FAIL(serialization::encode_bool(buf, len, new_pos, has_truncate_info_))) {
     LOG_WARN("failed to serialize has_truncate_info", K(ret), K(len), K(new_pos), K_(has_truncate_info));
+  } else if (PARAM_VERSION_V3 <= version_ && new_pos - pos < length && OB_FAIL(fork_info_.serialize(buf, len, new_pos))) {
+    LOG_WARN("failed to serialize fork info", K(ret), K(len), K(new_pos), K_(fork_info));
   } else if (OB_UNLIKELY(length != new_pos - pos)) {
     ret = OB_ERR_UNEXPECTED;
     LOG_WARN("length doesn't match standard length", K(ret), K(new_pos), K(pos), K(length));
@@ -1476,6 +1480,8 @@ int ObMigrationTabletParam::deserialize_v2_v3(const char *buf, const int64_t len
     LOG_WARN("failed to deserialize split info", K(ret), K(len));
   } else if (PARAM_VERSION_V3 <= version_ && new_pos - pos < length && OB_FAIL(serialization::decode_bool(buf, len, new_pos, &has_truncate_info_))) {
     LOG_WARN("failed to deserialize has_truncate_info", K(ret), K(len));
+  } else if (PARAM_VERSION_V3 <= version_ && new_pos - pos < length && OB_FAIL(fork_info_.deserialize(buf, len, new_pos))) {
+    LOG_WARN("failed to deserialize fork info", K(ret), K(len));
   } else if (OB_UNLIKELY(length != new_pos - pos)) {
     ret = OB_ERR_UNEXPECTED;
     LOG_WARN("tablet's length doesn't match standard length", K(ret), K(new_pos), K(pos), K(length), KPC(this));
@@ -1679,6 +1685,7 @@ int64_t ObMigrationTabletParam::get_serialize_size() const
     size += serialization::encoded_length_bool(is_storage_schema_cs_replica_);
     size += split_info_.get_serialize_size();
     size += serialization::encoded_length_bool(has_truncate_info_);
+    size += fork_info_.get_serialize_size();
   }
   return size;
 }
@@ -1723,6 +1730,7 @@ void ObMigrationTabletParam::reset()
   is_storage_schema_cs_replica_ = false;
   split_info_.reset();
   has_truncate_info_ = false;
+  fork_info_.reset();
   allocator_.reset();
 }
 
@@ -1768,6 +1776,7 @@ int ObMigrationTabletParam::assign(const ObMigrationTabletParam &param)
     is_storage_schema_cs_replica_ = param.is_storage_schema_cs_replica_;
     split_info_ = param.split_info_;
     has_truncate_info_ = param.has_truncate_info_;
+    fork_info_ = param.fork_info_;
     if (OB_FAIL(mds_data_.assign(param.mds_data_, allocator_))) {
       LOG_WARN("failed to assign mds data", K(ret), K(param));
     } else if (OB_FAIL(last_persisted_committed_tablet_status_.assign(
diff --git a/src/storage/tablet/ob_tablet_meta.h b/src/storage/tablet/ob_tablet_meta.h
@@ -334,7 +334,8 @@ struct ObMigrationTabletParam final
                K_(ddl_replay_status),
                K_(is_storage_schema_cs_replica),
                K_(split_info),
-               K_(has_truncate_info));
+               K_(has_truncate_info),
+               K_(fork_info));
 private:
   int deserialize_v2_v3(const char *buf, const int64_t len, int64_t &pos);
   int deserialize_v1(const char *buf, const int64_t len, int64_t &pos);
@@ -391,6 +392,7 @@ struct ObMigrationTabletParam final
   // [since 4.3.5 bp2] be True after first major with truncate info
   // will never be false even after truncate info recycled
   bool has_truncate_info_;
+  share::ObForkTabletInfo fork_info_;
 
   // Add new serialization member before this line, below members won't serialize
   common::ObArenaAllocator allocator_; // for storage schema
