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

Repair compatibility issues in transfer struct, add 'task_id_' as placeholder in the related struct .

Browse Source
This commit is contained in:
obdev
2024-02-26 13:48:26 +00:00
committed by ob-robot
parent 0323ccb138
commit f68293524b
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/storage/high_availability/ob_transfer_struct.cpp
View File

@ -30,6 +30,7 @@ ObTXStartTransferOutInfo::ObTXStartTransferOutInfo()
: src_ls_id_(), : src_ls_id_(),
dest_ls_id_(), dest_ls_id_(),
tablet_list_(), tablet_list_(),
task_id_(),
data_end_scn_() data_end_scn_()
{ {
} }
@ -39,6 +40,7 @@ void ObTXStartTransferOutInfo::reset()
src_ls_id_.reset(); src_ls_id_.reset();
dest_ls_id_.reset(); dest_ls_id_.reset();
tablet_list_.reset(); tablet_list_.reset();
task_id_.reset();
data_end_scn_.reset(); data_end_scn_.reset();
transfer_epoch_ = 0; transfer_epoch_ = 0;
} }
@ -62,19 +64,21 @@ int ObTXStartTransferOutInfo::assign(const ObTXStartTransferOutInfo &start_trans
} else { } else {
src_ls_id_ = start_transfer_out_info.src_ls_id_; src_ls_id_ = start_transfer_out_info.src_ls_id_;
dest_ls_id_ = start_transfer_out_info.dest_ls_id_; dest_ls_id_ = start_transfer_out_info.dest_ls_id_;
task_id_ = start_transfer_out_info.task_id_;
data_end_scn_ = start_transfer_out_info.data_end_scn_; data_end_scn_ = start_transfer_out_info.data_end_scn_;
transfer_epoch_ = start_transfer_out_info.transfer_epoch_; transfer_epoch_ = start_transfer_out_info.transfer_epoch_;
} }
return ret; return ret;
} }
OB_SERIALIZE_MEMBER(ObTXStartTransferOutInfo, src_ls_id_, dest_ls_id_, tablet_list_, data_end_scn_, transfer_epoch_); OB_SERIALIZE_MEMBER(ObTXStartTransferOutInfo, src_ls_id_, dest_ls_id_, tablet_list_, task_id_, data_end_scn_, transfer_epoch_);
ObTXStartTransferInInfo::ObTXStartTransferInInfo() ObTXStartTransferInInfo::ObTXStartTransferInInfo()
: src_ls_id_(), : src_ls_id_(),
dest_ls_id_(), dest_ls_id_(),
start_scn_(), start_scn_(),
tablet_meta_list_() tablet_meta_list_(),
task_id_()
{ {
} }
@ -84,6 +88,7 @@ void ObTXStartTransferInInfo::reset()
dest_ls_id_.reset(); dest_ls_id_.reset();
start_scn_.reset(); start_scn_.reset();
tablet_meta_list_.reset(); tablet_meta_list_.reset();
task_id_.reset();
} }
bool ObTXStartTransferInInfo::is_valid() const bool ObTXStartTransferInInfo::is_valid() const
@ -106,20 +111,22 @@ int ObTXStartTransferInInfo::assign(const ObTXStartTransferInInfo &start_transfe
src_ls_id_ = start_transfer_in_info.src_ls_id_; src_ls_id_ = start_transfer_in_info.src_ls_id_;
dest_ls_id_ = start_transfer_in_info.dest_ls_id_; dest_ls_id_ = start_transfer_in_info.dest_ls_id_;
start_scn_ = start_transfer_in_info.start_scn_; start_scn_ = start_transfer_in_info.start_scn_;
task_id_ = start_transfer_in_info.task_id_;
} }
return ret; return ret;
} }
OB_SERIALIZE_MEMBER(ObTXStartTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_meta_list_); OB_SERIALIZE_MEMBER(ObTXStartTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_meta_list_, task_id_);
/* ObTXFinishTransferInInfo */ /* ObTXFinishTransferInInfo */
OB_SERIALIZE_MEMBER(ObTXFinishTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_list_); OB_SERIALIZE_MEMBER(ObTXFinishTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_list_, task_id_);
ObTXFinishTransferInInfo::ObTXFinishTransferInInfo() ObTXFinishTransferInInfo::ObTXFinishTransferInInfo()
: src_ls_id_(), : src_ls_id_(),
dest_ls_id_(), dest_ls_id_(),
start_scn_(), start_scn_(),
tablet_list_() tablet_list_(),
task_id_()
{ {
} }
@ -129,6 +136,7 @@ void ObTXFinishTransferInInfo::reset()
dest_ls_id_.reset(); dest_ls_id_.reset();
start_scn_.reset(); start_scn_.reset();
tablet_list_.reset(); tablet_list_.reset();
task_id_.reset();
} }
bool ObTXFinishTransferInInfo::is_valid() const bool ObTXFinishTransferInInfo::is_valid() const
@ -151,17 +159,19 @@ int ObTXFinishTransferInInfo::assign(const ObTXFinishTransferInInfo &finish_tran
src_ls_id_ = finish_transfer_in_info.src_ls_id_; src_ls_id_ = finish_transfer_in_info.src_ls_id_;
dest_ls_id_ = finish_transfer_in_info.dest_ls_id_; dest_ls_id_ = finish_transfer_in_info.dest_ls_id_;
start_scn_ = finish_transfer_in_info.start_scn_; start_scn_ = finish_transfer_in_info.start_scn_;
task_id_ = finish_transfer_in_info.task_id_;
} }
return ret; return ret;
} }
/* ObTXFinishTransferOutInfo */ /* ObTXFinishTransferOutInfo */
OB_SERIALIZE_MEMBER(ObTXFinishTransferOutInfo, src_ls_id_, dest_ls_id_, finish_scn_, tablet_list_); OB_SERIALIZE_MEMBER(ObTXFinishTransferOutInfo, src_ls_id_, dest_ls_id_, finish_scn_, tablet_list_, task_id_);
ObTXFinishTransferOutInfo::ObTXFinishTransferOutInfo() ObTXFinishTransferOutInfo::ObTXFinishTransferOutInfo()
: src_ls_id_(), : src_ls_id_(),
dest_ls_id_(), dest_ls_id_(),
finish_scn_(), finish_scn_(),
tablet_list_() tablet_list_(),
task_id_()
{ {
} }
void ObTXFinishTransferOutInfo::reset() void ObTXFinishTransferOutInfo::reset()
@ -170,6 +180,7 @@ void ObTXFinishTransferOutInfo::reset()
dest_ls_id_.reset(); dest_ls_id_.reset();
finish_scn_.reset(); finish_scn_.reset();
tablet_list_.reset(); tablet_list_.reset();
task_id_.reset();
} }
bool ObTXFinishTransferOutInfo::is_valid() const bool ObTXFinishTransferOutInfo::is_valid() const
{ {
@ -191,6 +202,7 @@ int ObTXFinishTransferOutInfo::assign(const ObTXFinishTransferOutInfo &finish_tr
src_ls_id_ = finish_transfer_out_info.src_ls_id_; src_ls_id_ = finish_transfer_out_info.src_ls_id_;
dest_ls_id_ = finish_transfer_out_info.dest_ls_id_; dest_ls_id_ = finish_transfer_out_info.dest_ls_id_;
finish_scn_ = finish_transfer_out_info.finish_scn_; finish_scn_ = finish_transfer_out_info.finish_scn_;
task_id_ = finish_transfer_out_info.task_id_;
} }
return ret; return ret;
} }

13
src/storage/high_availability/ob_transfer_struct.h
View File

@ -37,11 +37,12 @@ public:
bool is_valid() const; bool is_valid() const;
int assign(const ObTXStartTransferOutInfo &start_transfer_out_info); int assign(const ObTXStartTransferOutInfo &start_transfer_out_info);
TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(tablet_list), K_(data_end_scn), K_(transfer_epoch)); TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(tablet_list), K_(task_id), K_(data_end_scn), K_(transfer_epoch));
share::ObLSID src_ls_id_; share::ObLSID src_ls_id_;
share::ObLSID dest_ls_id_; share::ObLSID dest_ls_id_;
common::ObSArray<share::ObTransferTabletInfo> tablet_list_; common::ObSArray<share::ObTransferTabletInfo> tablet_list_;
share::ObTransferTaskID task_id_;
share::SCN data_end_scn_; share::SCN data_end_scn_;
int64_t transfer_epoch_; int64_t transfer_epoch_;
DISALLOW_COPY_AND_ASSIGN(ObTXStartTransferOutInfo); DISALLOW_COPY_AND_ASSIGN(ObTXStartTransferOutInfo);
@ -57,12 +58,14 @@ public:
bool is_valid() const; bool is_valid() const;
int assign(const ObTXStartTransferInInfo &start_transfer_in_info); int assign(const ObTXStartTransferInInfo &start_transfer_in_info);
TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_meta_list)); TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_meta_list), K_(task_id));
share::ObLSID src_ls_id_; share::ObLSID src_ls_id_;
share::ObLSID dest_ls_id_; share::ObLSID dest_ls_id_;
share::SCN start_scn_; share::SCN start_scn_;
common::ObSArray<ObMigrationTabletParam> tablet_meta_list_; common::ObSArray<ObMigrationTabletParam> tablet_meta_list_;
share::ObTransferTaskID task_id_;
DISALLOW_COPY_AND_ASSIGN(ObTXStartTransferInInfo); DISALLOW_COPY_AND_ASSIGN(ObTXStartTransferInInfo);
}; };
@ -76,11 +79,12 @@ public:
bool is_valid() const; bool is_valid() const;
int assign(const ObTXFinishTransferOutInfo &finish_transfer_out_info); int assign(const ObTXFinishTransferOutInfo &finish_transfer_out_info);
TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(finish_scn), K_(tablet_list)); TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(finish_scn), K_(tablet_list), K_(task_id));
share::ObLSID src_ls_id_; share::ObLSID src_ls_id_;
share::ObLSID dest_ls_id_; share::ObLSID dest_ls_id_;
share::SCN finish_scn_; share::SCN finish_scn_;
common::ObSArray<share::ObTransferTabletInfo> tablet_list_; common::ObSArray<share::ObTransferTabletInfo> tablet_list_;
share::ObTransferTaskID task_id_;
DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferOutInfo); DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferOutInfo);
}; };
@ -94,11 +98,12 @@ public:
bool is_valid() const; bool is_valid() const;
int assign(const ObTXFinishTransferInInfo &finish_transfer_in_info); int assign(const ObTXFinishTransferInInfo &finish_transfer_in_info);
TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_list)); TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_list), K_(task_id));
share::ObLSID src_ls_id_; share::ObLSID src_ls_id_;
share::ObLSID dest_ls_id_; share::ObLSID dest_ls_id_;
share::SCN start_scn_; share::SCN start_scn_;
common::ObSArray<share::ObTransferTabletInfo> tablet_list_; common::ObSArray<share::ObTransferTabletInfo> tablet_list_;
share::ObTransferTaskID task_id_;
DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferInInfo); DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferInInfo);
}; };