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

[UPGRADE] CP 4.2.1.1 to master

Browse Source
This commit is contained in:
tino247 2023-11-03 09:13:32 +00:00 committed by ob-robot
parent 718887095b
commit 4646e5136d
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/share/ob_cluster_version.h
View File

@ -170,6 +170,7 @@ cal_version(const uint64_t major, const uint64_t minor, const uint64_t major_pat
#define CLUSTER_VERSION_4_1_0_2 (oceanbase::common::cal_version(4, 1, 0, 2))
#define CLUSTER_VERSION_4_2_0_0 (oceanbase::common::cal_version(4, 2, 0, 0))
#define CLUSTER_VERSION_4_2_1_0 (oceanbase::common::cal_version(4, 2, 1, 0))
#define CLUSTER_VERSION_4_2_1_1 (oceanbase::common::cal_version(4, 2, 1, 1))
#define CLUSTER_VERSION_4_2_2_0 (oceanbase::common::cal_version(4, 2, 2, 0))
#define CLUSTER_VERSION_4_3_0_0 (oceanbase::common::cal_version(4, 3, 0, 0))
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

3
src/share/ob_upgrade_utils.cpp
View File

@ -44,6 +44,7 @@ const uint64_t ObUpgradeChecker::UPGRADE_PATH[DATA_VERSION_NUM] = {
CALC_VERSION(4UL, 1UL, 0UL, 2UL), // 4.1.0.2
CALC_VERSION(4UL, 2UL, 0UL, 0UL), // 4.2.0.0
CALC_VERSION(4UL, 2UL, 1UL, 0UL), // 4.2.1.0
CALC_VERSION(4UL, 2UL, 1UL, 1UL), // 4.2.1.1
CALC_VERSION(4UL, 2UL, 2UL, 0UL), // 4.2.2.0
CALC_VERSION(4UL, 3UL, 0UL, 0UL) // 4.3.0.0
};
@ -65,6 +66,7 @@ int ObUpgradeChecker::get_data_version_by_cluster_version(
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_1_0_2, DATA_VERSION_4_1_0_2)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_0_0, DATA_VERSION_4_2_0_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_1_0, DATA_VERSION_4_2_1_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_1_1, DATA_VERSION_4_2_1_1)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_2_2_0, DATA_VERSION_4_2_2_0)
CONVERT_CLUSTER_VERSION_TO_DATA_VERSION(CLUSTER_VERSION_4_3_0_0, DATA_VERSION_4_3_0_0)
#undef CONVERT_CLUSTER_VERSION_TO_DATA_VERSION
@ -625,6 +627,7 @@ int ObUpgradeProcesserSet::init(
INIT_PROCESSOR_BY_VERSION(4, 1, 0, 2);
INIT_PROCESSOR_BY_VERSION(4, 2, 0, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 1, 0);
INIT_PROCESSOR_BY_VERSION(4, 2, 1, 1);
INIT_PROCESSOR_BY_VERSION(4, 2, 2, 0);
INIT_PROCESSOR_BY_VERSION(4, 3, 0, 0);
#undef INIT_PROCESSOR_BY_VERSION

3
src/share/ob_upgrade_utils.h
View File

@ -170,7 +170,7 @@ public:
const uint64_t cluster_version,
uint64_t &data_version);
public:
static const int64_t DATA_VERSION_NUM = 8;
static const int64_t DATA_VERSION_NUM = 9;
static const uint64_t UPGRADE_PATH[DATA_VERSION_NUM];
};
@ -210,6 +210,7 @@ private:
};
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 1)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 2, 0)
DEF_SIMPLE_UPGRARD_PROCESSER(4, 3, 0, 0)
/* =========== special upgrade processor end ============= */

13
tools/upgrade/oceanbase_upgrade_dep.yml
View File

@ -55,10 +55,17 @@
can_be_upgraded_to:
- 4.2.1.0
# 4.2.1.x is barrier
- version: 4.2.1.0
can_be_upgraded_to:
- 4.3.0.0
- 4.2.1.1
- version: 4.3.0.0
- version: 4.2.1.1
can_be_upgraded_to:
- 4.3.1.0
- 4.3.0.0
require_from_binary:
value: True
when_come_from: [4.1.0.0, 4.1.0.1, 4.1.0.2, 4.2.0.0]
# 4.3.0.x
- version: 4.3.0.0