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

[BUG] fix data end scn not setten during upgrading

Browse Source
This commit is contained in:
Handora
2024-02-09 15:52:44 +00:00
committed by ob-robot
parent 9913d92c1d
commit 4a6436fe53
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,6 @@ bool ObTXStartTransferOutInfo::is_valid() const
return src_ls_id_.is_valid() return src_ls_id_.is_valid()
&& dest_ls_id_.is_valid() && dest_ls_id_.is_valid()
&& !tablet_list_.empty() && !tablet_list_.empty()
&& data_end_scn_.is_valid()
&& transfer_epoch_ > 0; && transfer_epoch_ > 0;
} }

4
src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp
View File

@ -747,7 +747,7 @@ int ObTabletStartTransferOutV2Helper::on_register(
LOG_WARN("on register start transfer out tx get invalid argument", KR(ret), KP(buf), K(len)); LOG_WARN("on register start transfer out tx get invalid argument", KR(ret), KP(buf), K(len));
} else if (CLICK_FAIL(info.deserialize(buf, len, pos))) { } else if (CLICK_FAIL(info.deserialize(buf, len, pos))) {
LOG_WARN("failed to deserialize tx start transfer out tx info", KR(ret), K(len), K(pos)); LOG_WARN("failed to deserialize tx start transfer out tx info", KR(ret), K(len), K(pos));
} else if (!info.is_valid()) { } else if (!info.is_valid() || !info.data_end_scn_.is_valid()) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("tx start transfer out tx info is unexpected", KR(ret), K(info)); LOG_WARN("tx start transfer out tx info is unexpected", KR(ret), K(info));
} else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) {
@ -803,7 +803,7 @@ int ObTabletStartTransferOutV2Helper::on_replay(const char *buf,
LOG_WARN("on replay start transfer out tx get invalid argument", KR(ret), KP(buf), K(len)); LOG_WARN("on replay start transfer out tx get invalid argument", KR(ret), KP(buf), K(len));
} else if (CLICK_FAIL(info.deserialize(buf, len, pos))) { } else if (CLICK_FAIL(info.deserialize(buf, len, pos))) {
LOG_WARN("failed to deserialize tx start transfer out tx info", KR(ret), K(len), K(pos)); LOG_WARN("failed to deserialize tx start transfer out tx info", KR(ret), K(len), K(pos));
} else if (!info.is_valid()) { } else if (!info.is_valid() || !info.data_end_scn_.is_valid()) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("tx start transfer out tx info is unexpected", KR(ret), K(info)); LOG_WARN("tx start transfer out tx info is unexpected", KR(ret), K(info));
} else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) { } else if (OB_FAIL(MTL(ObLSService*)->get_ls(info.src_ls_id_, ls_handle, ObLSGetMod::STORAGE_MOD))) {