hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix problem when upgrade from 430release to master : force_use_data_source

Browse Source
This commit is contained in:
zhangzhenyuyu 2024-03-26 03:16:33 +00:00 committed by ob-robot
parent ed9607606c
commit 2f42d09925
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/ob_rpc_struct.cpp
View File

@ -3724,6 +3724,7 @@ OB_SERIALIZE_MEMBER(ObLSMigrateReplicaArg,
data_source_,
paxos_replica_number_,
skip_change_member_list_,
force_use_data_source_,
force_data_source_);
int ObLSMigrateReplicaArg::assign(
@ -3738,6 +3739,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_;
force_data_source_ = that.force_data_source_;
return ret;
}
@ -3773,6 +3775,7 @@ OB_SERIALIZE_MEMBER(ObLSAddReplicaArg,
orig_paxos_replica_number_,
new_paxos_replica_number_,
skip_change_member_list_,
force_use_data_source_,
force_data_source_);
int ObLSAddReplicaArg::assign(
@ -3787,6 +3790,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_;
force_data_source_ = that.force_data_source_;
return ret;
}

8
src/share/ob_rpc_struct.h
View File

@ -4124,6 +4124,7 @@ public:
data_source_(),
paxos_replica_number_(0),
skip_change_member_list_(),
force_use_data_source_(false),
force_data_source_() {}
public:
int assign(const ObLSMigrateReplicaArg &that);
@ -4146,6 +4147,7 @@ public:
K_(data_source),
K_(paxos_replica_number),
K_(skip_change_member_list),
K_(force_use_data_source),
K_(force_data_source));
bool is_valid() const {
@ -4166,6 +4168,8 @@ public:
common::ObReplicaMember data_source_;
int64_t paxos_replica_number_;
bool skip_change_member_list_;
bool force_use_data_source_;
// deprecated field, in order to fix the upgrade compatibility issue from 430rc2 to master
common::ObReplicaMember force_data_source_;
};
@ -4183,6 +4187,7 @@ public:
orig_paxos_replica_number_(0),
new_paxos_replica_number_(0),
skip_change_member_list_(false),
force_use_data_source_(false),
force_data_source_() {}
public:
int assign(const ObLSAddReplicaArg &that);
@ -4205,6 +4210,7 @@ public:
K_(orig_paxos_replica_number),
K_(new_paxos_replica_number),
K_(skip_change_member_list),
K_(force_use_data_source),
K_(force_data_source));
bool is_valid() const {
@ -4225,6 +4231,8 @@ public:
int64_t orig_paxos_replica_number_;
int64_t new_paxos_replica_number_;
bool skip_change_member_list_;
bool force_use_data_source_;
// deprecated field, in order to fix the upgrade compatibility issue from 430rc2 to master
common::ObReplicaMember force_data_source_;
};