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

fix add replica of same version observer when 4.3.0/4.3.1 upgrade to 4.3.2

Browse Source
This commit is contained in:
obdev 2024-07-04 08:55:29 +00:00 committed by ob-robot
parent b923637c25
commit 92b3d6058a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mittest/mtlenv/storage/test_mds_compat.cpp
View File

@ -355,7 +355,7 @@ TEST_F(TestMdsCompat, migration_param)
ObMigrationTabletParam param;
ret = tablet->build_migration_tablet_param(param);
param.last_persisted_committed_tablet_status_.on_init();
ASSERT_EQ(OB_NOT_SUPPORTED, ret);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_TRUE(param.is_valid());
// replace mds data in migration tablet param with our mocked mds data

8
src/storage/tablet/ob_tablet.cpp
View File

@ -4911,7 +4911,6 @@ int ObTablet::build_migration_tablet_param(
ObMigrationTabletParam &mig_tablet_param) const
{
int ret = OB_SUCCESS;
uint64_t data_version = 0;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
@ -4953,11 +4952,6 @@ int ObTablet::build_migration_tablet_param(
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(GET_MIN_DATA_VERSION(MTL_ID(), data_version))) {
LOG_WARN("fail to get data version", K(ret));
} else if (data_version < DATA_VERSION_4_3_2_0) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("data version is less than 4.3.2, should not do migration", K(ret), K(data_version));
} else {
mig_tablet_param.version_ = ObMigrationTabletParam::PARAM_VERSION_V3;
mig_tablet_param.extra_medium_info_.info_ = tablet_meta_.extra_medium_info_.info_;
@ -4966,7 +4960,7 @@ int ObTablet::build_migration_tablet_param(
LOG_WARN("fail to assign mig tablet param from tablet meta",
K(ret), K(tablet_meta_.last_persisted_committed_tablet_status_));
} else {
LOG_INFO("mds data is deprecated under current data version", K(ret), K(data_version));
LOG_INFO("build migration tablet param successfully", K(mig_tablet_param));
}
}
}