diff --git a/src/share/ob_rpc_struct.cpp b/src/share/ob_rpc_struct.cpp index ee533c9c7..cb83e3f9b 100755 --- a/src/share/ob_rpc_struct.cpp +++ b/src/share/ob_rpc_struct.cpp @@ -7094,7 +7094,16 @@ OB_SERIALIZE_MEMBER((ObLabelSePolicyDDLArg, ObDDLArg), ddl_type_, schema_); OB_SERIALIZE_MEMBER((ObLabelSeComponentDDLArg, ObDDLArg), ddl_type_, schema_, policy_name_); OB_SERIALIZE_MEMBER((ObLabelSeLabelDDLArg, ObDDLArg), ddl_type_, schema_, policy_name_); OB_SERIALIZE_MEMBER((ObLabelSeUserLevelDDLArg, ObDDLArg), ddl_type_, level_schema_, policy_name_); -OB_SERIALIZE_MEMBER(ObCheckServerEmptyArg, mode_, sys_data_version_); +OB_SERIALIZE_MEMBER(ObCheckServerEmptyArg, mode_, sys_data_version_, server_id_); +int ObCheckServerEmptyArg::assign(const ObCheckServerEmptyArg &other) +{ + int ret = OB_SUCCESS; + mode_ = other.mode_; + sys_data_version_ = other.sys_data_version_; + server_id_ = other.server_id_; + return ret; +} + OB_SERIALIZE_MEMBER(ObCheckServerForAddingServerArg, mode_, sys_tenant_data_version_, server_id_); int ObCheckServerForAddingServerArg::init( const Mode &mode, diff --git a/src/share/ob_rpc_struct.h b/src/share/ob_rpc_struct.h index 0f957ce99..3c8120ad7 100755 --- a/src/share/ob_rpc_struct.h +++ b/src/share/ob_rpc_struct.h @@ -8762,20 +8762,23 @@ public: ADD_SERVER }; - ObCheckServerEmptyArg(): mode_(BOOTSTRAP), sys_data_version_(0) {} + ObCheckServerEmptyArg(): mode_(BOOTSTRAP), sys_data_version_(0), server_id_(OB_INVALID_ID) {} ObCheckServerEmptyArg(const Mode mode, const uint64_t sys_data_version) - : mode_(mode), sys_data_version_(sys_data_version) {} - TO_STRING_KV(K_(mode), K_(sys_data_version)); + : mode_(mode), sys_data_version_(sys_data_version), server_id_(OB_INVALID_ID) {} + TO_STRING_KV(K_(mode), K_(sys_data_version), K_(server_id)); + int assign(const ObCheckServerEmptyArg &other); Mode mode_; uint64_t sys_data_version_; + uint64_t server_id_; }; struct ObCheckServerForAddingServerArg { OB_UNIS_VERSION(1); public: enum Mode { - ADD_SERVER + ADD_SERVER, + BOOTSTRAP }; ObCheckServerForAddingServerArg(): mode_(ADD_SERVER), sys_tenant_data_version_(0), server_id_(OB_INVALID_ID) {}