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

forbid cross version migration

Browse Source
This commit is contained in:
oceanoverflow
2023-01-12 14:41:53 +00:00
committed by OB-robot
parent 462975b470
commit a8504f099a
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/high_availability/ob_storage_ha_src_provider.cpp
View File

@ -194,8 +194,8 @@ int ObStorageHASrcProvider::inner_choose_ob_src_(const uint64_t tenant_id, const
obrpc::ObFetchLSMetaInfoResp ls_info;
ObMigrationStatus migration_status;
share::ObLSRestoreStatus restore_status;
if (OB_SUCCESS != (tmp_ret = fetch_ls_meta_info_(tenant_id, ls_id, addr, ls_info))) {
LOG_WARN("failed to fetch ls meta info", K(ret), K(tenant_id), K(ls_id), K(addr));
if (OB_TMP_FAIL(fetch_ls_meta_info_(tenant_id, ls_id, addr, ls_info))) {
LOG_WARN("failed to fetch ls meta info", K(tmp_ret), K(tenant_id), K(ls_id), K(addr));
} else if (!ObReplicaTypeCheck::is_full_replica(ls_info.ls_meta_package_.ls_meta_.replica_type_)) {
LOG_INFO("do not choose this src", K(tenant_id), K(ls_id), K(addr), K(ls_info));
} else if (local_clog_checkpoint_scn > ls_info.ls_meta_package_.ls_meta_.get_clog_checkpoint_scn()) {

46
src/storage/ob_storage_rpc.h
View File

@ -49,7 +49,7 @@ namespace obrpc
struct ObCopyMacroBlockArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyMacroBlockArg();
virtual ~ObCopyMacroBlockArg() {}
@ -61,7 +61,7 @@ public:
struct ObCopyMacroBlockListArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyMacroBlockListArg();
virtual ~ObCopyMacroBlockListArg() {}
@ -79,7 +79,7 @@ public:
struct ObCopyMacroBlockRangeArg final
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyMacroBlockRangeArg();
~ObCopyMacroBlockRangeArg() {}
@ -102,7 +102,7 @@ public:
struct ObCopyMacroBlockHeader
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyMacroBlockHeader();
virtual ~ObCopyMacroBlockHeader() {}
@ -116,7 +116,7 @@ public:
struct ObCopyTabletInfoArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyTabletInfoArg();
virtual ~ObCopyTabletInfoArg() {}
@ -135,7 +135,7 @@ public:
struct ObCopyTabletInfo
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyTabletInfo();
virtual ~ObCopyTabletInfo() {}
@ -152,7 +152,7 @@ public:
struct ObCopyTabletSSTableInfoArg final
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyTabletSSTableInfoArg();
~ObCopyTabletSSTableInfoArg();
@ -169,7 +169,7 @@ public:
struct ObCopyTabletsSSTableInfoArg final
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyTabletsSSTableInfoArg();
~ObCopyTabletsSSTableInfoArg();
@ -191,7 +191,7 @@ public:
struct ObCopyTabletSSTableInfo
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyTabletSSTableInfo();
virtual ~ObCopyTabletSSTableInfo() {}
@ -207,7 +207,7 @@ public:
struct ObCopyLSInfoArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyLSInfoArg();
virtual ~ObCopyLSInfoArg() {}
@ -221,7 +221,7 @@ public:
struct ObCopyLSInfo
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyLSInfo();
virtual ~ObCopyLSInfo() {}
@ -236,7 +236,7 @@ public:
struct ObFetchLSMetaInfoArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObFetchLSMetaInfoArg();
virtual ~ObFetchLSMetaInfoArg() {}
@ -250,7 +250,7 @@ public:
struct ObFetchLSMetaInfoResp
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObFetchLSMetaInfoResp();
virtual ~ObFetchLSMetaInfoResp() {}
@ -263,7 +263,7 @@ public:
struct ObFetchLSMemberListArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObFetchLSMemberListArg();
virtual ~ObFetchLSMemberListArg() {}
@ -277,7 +277,7 @@ public:
struct ObFetchLSMemberListInfo
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObFetchLSMemberListInfo();
virtual ~ObFetchLSMemberListInfo() {}
@ -290,7 +290,7 @@ public:
struct ObCopySSTableMacroRangeInfoArg final
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopySSTableMacroRangeInfoArg();
~ObCopySSTableMacroRangeInfoArg();
@ -311,7 +311,7 @@ public:
struct ObCopySSTableMacroRangeInfoHeader final
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopySSTableMacroRangeInfoHeader();
~ObCopySSTableMacroRangeInfoHeader();
@ -325,7 +325,7 @@ public:
struct ObCopyTabletSSTableHeader final
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObCopyTabletSSTableHeader();
~ObCopyTabletSSTableHeader() {}
@ -342,7 +342,7 @@ public:
// Leader notify follower to restore some tablets.
struct ObNotifyRestoreTabletsArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObNotifyRestoreTabletsArg();
virtual ~ObNotifyRestoreTabletsArg() {}
@ -359,7 +359,7 @@ public:
struct ObNotifyRestoreTabletsResp
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObNotifyRestoreTabletsResp();
virtual ~ObNotifyRestoreTabletsResp() {}
@ -375,7 +375,7 @@ public:
struct ObInquireRestoreResp
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObInquireRestoreResp();
virtual ~ObInquireRestoreResp() {}
@ -391,7 +391,7 @@ public:
struct ObInquireRestoreArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObInquireRestoreArg();
virtual ~ObInquireRestoreArg() {}
@ -406,7 +406,7 @@ public:
struct ObRestoreUpdateLSMetaArg
{
OB_UNIS_VERSION(1);
OB_UNIS_VERSION(2);
public:
ObRestoreUpdateLSMetaArg();
virtual ~ObRestoreUpdateLSMetaArg() {}