From b866dafca8535e907fc6bd1b4fad7ee8531e7342 Mon Sep 17 00:00:00 2001
From: zhangzhenyuyu <zhangzhenyuxd@163.com>
Date: Mon, 4 Mar 2024 03:50:37 +0000
Subject: [PATCH] add rpc field on master

---
 src/share/ob_rpc_struct.cpp |  8 ++++++--
 src/share/ob_rpc_struct.h   | 14 ++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/share/ob_rpc_struct.cpp b/src/share/ob_rpc_struct.cpp
index 2e301535d8..ade8b6bf0b 100755
--- a/src/share/ob_rpc_struct.cpp
+++ b/src/share/ob_rpc_struct.cpp
@@ -3723,7 +3723,8 @@ OB_SERIALIZE_MEMBER(ObLSMigrateReplicaArg,
                     dst_,
                     data_source_,
                     paxos_replica_number_,
-                    skip_change_member_list_);
+                    skip_change_member_list_,
+                    force_use_data_source_);
 
 int ObLSMigrateReplicaArg::assign(
     const ObLSMigrateReplicaArg &that)
@@ -3737,6 +3738,7 @@ int ObLSMigrateReplicaArg::assign(
   data_source_ = that.data_source_;
   paxos_replica_number_ = that.paxos_replica_number_;
   skip_change_member_list_ = that.skip_change_member_list_;
+  force_use_data_source_ = that.force_use_data_source_;
   return ret;
 }
 
@@ -3770,7 +3772,8 @@ OB_SERIALIZE_MEMBER(ObLSAddReplicaArg,
                     data_source_,
                     orig_paxos_replica_number_,
                     new_paxos_replica_number_,
-                    skip_change_member_list_);
+                    skip_change_member_list_,
+                    force_use_data_source_);
 
 int ObLSAddReplicaArg::assign(
     const ObLSAddReplicaArg &that)
@@ -3784,6 +3787,7 @@ int ObLSAddReplicaArg::assign(
   orig_paxos_replica_number_ = that.orig_paxos_replica_number_;
   new_paxos_replica_number_ = that.new_paxos_replica_number_;
   skip_change_member_list_ = that.skip_change_member_list_;
+  force_use_data_source_ = that.force_use_data_source_;
   return ret;
 }
 
diff --git a/src/share/ob_rpc_struct.h b/src/share/ob_rpc_struct.h
index 739fbd59a6..376cf84924 100755
--- a/src/share/ob_rpc_struct.h
+++ b/src/share/ob_rpc_struct.h
@@ -4118,7 +4118,8 @@ public:
       dst_(),
       data_source_(),
       paxos_replica_number_(0),
-      skip_change_member_list_() {}
+      skip_change_member_list_(),
+      force_use_data_source_(false) {}
 public:
   int assign(const ObLSMigrateReplicaArg &that);
 
@@ -4139,7 +4140,8 @@ public:
                K_(dst),
                K_(data_source),
                K_(paxos_replica_number),
-               K_(skip_change_member_list));
+               K_(skip_change_member_list),
+               K_(force_use_data_source));
 
   bool is_valid() const {
     return !task_id_.is_invalid()
@@ -4159,6 +4161,7 @@ public:
   common::ObReplicaMember data_source_;
   int64_t paxos_replica_number_;
   bool skip_change_member_list_;
+  bool force_use_data_source_;
 };
 
 struct ObLSAddReplicaArg
@@ -4174,7 +4177,8 @@ public:
       data_source_(),
       orig_paxos_replica_number_(0),
       new_paxos_replica_number_(0),
-      skip_change_member_list_(false) {}
+      skip_change_member_list_(false),
+      force_use_data_source_(false) {}
 public:
   int assign(const ObLSAddReplicaArg &that);
 
@@ -4195,7 +4199,8 @@ public:
                K_(data_source),
                K_(orig_paxos_replica_number),
                K_(new_paxos_replica_number),
-               K_(skip_change_member_list));
+               K_(skip_change_member_list),
+               K_(force_use_data_source));
 
   bool is_valid() const {
     return !task_id_.is_invalid()
@@ -4215,6 +4220,7 @@ public:
   int64_t orig_paxos_replica_number_;
   int64_t new_paxos_replica_number_;
   bool skip_change_member_list_;
+  bool force_use_data_source_;
 };
 
 struct ObLSChangeReplicaArg