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

upgrade opensource release from 3.1.3 to 3.1.4

Browse Source
This commit is contained in:
obdev
2022-06-15 10:33:31 +08:00
committed by wangzelin.wzl
parent c0d957ebca
commit 8aa89364bb
11 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -4,7 +4,7 @@ include(cmake/Utils.cmake)
include(cmake/Env.cmake) include(cmake/Env.cmake)
project("OceanBase CE" project("OceanBase CE"
VERSION 3.1.3 VERSION 3.1.4
DESCRIPTION "OceanBase distributed database system" DESCRIPTION "OceanBase distributed database system"
HOMEPAGE_URL "https://open.oceanbase.com/" HOMEPAGE_URL "https://open.oceanbase.com/"
LANGUAGES CXX C ASM) LANGUAGES CXX C ASM)

4
cmake/RPM.cmake
View File

@ -17,10 +17,10 @@ list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/home/admin/oceanbase
set(CPACK_PACKAGE_NAME "oceanbase-ce") set(CPACK_PACKAGE_NAME "oceanbase-ce")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OceanBase CE is a distributed relational database") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OceanBase CE is a distributed relational database")
set(CPACK_PACKAGE_VENDOR "Ant Group CO., Ltd.") set(CPACK_PACKAGE_VENDOR "Ant Group CO., Ltd.")
set(CPACK_PACKAGE_VERSION 3.1.3) set(CPACK_PACKAGE_VERSION 3.1.4)
set(CPACK_PACKAGE_VERSION_MAJOR 3) set(CPACK_PACKAGE_VERSION_MAJOR 3)
set(CPACK_PACKAGE_VERSION_MINOR 1) set(CPACK_PACKAGE_VERSION_MINOR 1)
set(CPACK_PACKAGE_VERSION_PATCH 3) set(CPACK_PACKAGE_VERSION_PATCH 4)
set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases") set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
set(CPACK_RPM_PACKAGE_URL "https://open.oceanbase.com") set(CPACK_RPM_PACKAGE_URL "https://open.oceanbase.com")
set(CPACK_RPM_PACKAGE_DESCRIPTION "OceanBase CE is a distributed relational database") set(CPACK_RPM_PACKAGE_DESCRIPTION "OceanBase CE is a distributed relational database")

3
src/share/ob_cluster_version.h
View File

@ -95,11 +95,12 @@ uint64_t cal_version(const uint64_t major, const uint64_t minor, const uint64_t
#define CLUSTER_VERSION_311 (oceanbase::common::cal_version(3, 1, 1)) #define CLUSTER_VERSION_311 (oceanbase::common::cal_version(3, 1, 1))
#define CLUSTER_VERSION_312 (oceanbase::common::cal_version(3, 1, 2)) #define CLUSTER_VERSION_312 (oceanbase::common::cal_version(3, 1, 2))
#define CLUSTER_VERSION_313 (oceanbase::common::cal_version(3, 1, 3)) #define CLUSTER_VERSION_313 (oceanbase::common::cal_version(3, 1, 3))
#define CLUSTER_VERSION_314 (oceanbase::common::cal_version(3, 1, 4))
#define CLUSTER_VERSION_MAX UINT64_MAX #define CLUSTER_VERSION_MAX UINT64_MAX
// FIXME If you update the above version, please update me, CLUSTER_CURRENT_VERSION & ObUpgradeChecker!!!!!! // FIXME If you update the above version, please update me, CLUSTER_CURRENT_VERSION & ObUpgradeChecker!!!!!!
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_313 #define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_314
#define GET_MIN_CLUSTER_VERSION() (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version()) #define GET_MIN_CLUSTER_VERSION() (oceanbase::common::ObClusterVersion::get_instance().get_cluster_version())
#define GET_UNIS_CLUSTER_VERSION() (::oceanbase::lib::get_unis_compat_version() ?: GET_MIN_CLUSTER_VERSION()) #define GET_UNIS_CLUSTER_VERSION() (::oceanbase::lib::get_unis_compat_version() ?: GET_MIN_CLUSTER_VERSION())

4
src/share/ob_upgrade_utils.cpp
View File

@ -32,7 +32,8 @@ namespace share {
const uint64_t ObUpgradeChecker::UPGRADE_PATH[CLUTER_VERSION_NUM] = { const uint64_t ObUpgradeChecker::UPGRADE_PATH[CLUTER_VERSION_NUM] = {
CALC_CLUSTER_VERSION(3UL, 1UL, 1UL), //3.1.1 CALC_CLUSTER_VERSION(3UL, 1UL, 1UL), //3.1.1
CALC_CLUSTER_VERSION(3UL, 1UL, 2UL), //3.1.2 CALC_CLUSTER_VERSION(3UL, 1UL, 2UL), //3.1.2
CALC_CLUSTER_VERSION(3UL, 1UL, 3UL) //3.1.3 CALC_CLUSTER_VERSION(3UL, 1UL, 3UL), //3.1.3
CALC_CLUSTER_VERSION(3UL, 1UL, 4UL) //3.1.4
}; };
bool ObUpgradeChecker::check_cluster_version_exist(const uint64_t version) bool ObUpgradeChecker::check_cluster_version_exist(const uint64_t version)
@ -1090,6 +1091,7 @@ int ObUpgradeProcesserSet::init(ObBaseUpgradeProcessor::UpgradeMode mode, common
INIT_PROCESSOR_BY_VERSION(3, 1, 1); INIT_PROCESSOR_BY_VERSION(3, 1, 1);
INIT_PROCESSOR_BY_VERSION(3, 1, 2); INIT_PROCESSOR_BY_VERSION(3, 1, 2);
INIT_PROCESSOR_BY_VERSION(3, 1, 3); INIT_PROCESSOR_BY_VERSION(3, 1, 3);
INIT_PROCESSOR_BY_VERSION(3, 1, 4);
#undef INIT_PROCESSOR_BY_VERSION #undef INIT_PROCESSOR_BY_VERSION
inited_ = true; inited_ = true;
} }

3
src/share/ob_upgrade_utils.h
View File

@ -181,7 +181,7 @@ public:
static bool check_cluster_version_exist(const uint64_t version); static bool check_cluster_version_exist(const uint64_t version);
public: public:
static const int64_t CLUTER_VERSION_NUM = 3; static const int64_t CLUTER_VERSION_NUM = 4;
static const uint64_t UPGRADE_PATH[CLUTER_VERSION_NUM]; static const uint64_t UPGRADE_PATH[CLUTER_VERSION_NUM];
}; };
@ -233,6 +233,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 0);
DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 1); DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 1);
DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 2); DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 2);
DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 3); DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 3);
DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 4);
/* =========== upgrade processor end ============= */ /* =========== upgrade processor end ============= */

2
src/share/parameter/ob_parameter_seed.ipp
View File

@ -528,7 +528,7 @@ DEF_TIME(get_leader_candidate_rpc_timeout, OB_CLUSTER_PARAMETER, "9s", "[2s, 180
"the time during a get leader candidate rpc request " "the time during a get leader candidate rpc request "
"is permitted to execute before it is terminated. Range: [2s, 180s]", "is permitted to execute before it is terminated. Range: [2s, 180s]",
ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "3.1.3", "the min observer version", DEF_STR(min_observer_version, OB_CLUSTER_PARAMETER, "3.1.4", "the min observer version",
ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_BOOL(enable_ddl, OB_CLUSTER_PARAMETER, "True", DEF_BOOL(enable_ddl, OB_CLUSTER_PARAMETER, "True",
"specifies whether DDL operation is turned on. " "specifies whether DDL operation is turned on. "

3
tools/upgrade/oceanbase_upgrade_dep.yml
View File

@ -26,3 +26,6 @@
- version: 3.1.3 - version: 3.1.3
can_be_upgraded_to: can_be_upgraded_to:
- 3.1.4 - 3.1.4
- version: 3.1.4
can_be_upgraded_to:
- 3.1.5

2
tools/upgrade/special_upgrade_action_post.py
View File

@ -17,7 +17,7 @@ def do_special_upgrade(conn, cur, tenant_id_list, user, pwd):
#因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end #因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end
#这两行之间的这些代码，如果不写在这两行之间的话会导致清空不掉相应的代码。 #这两行之间的这些代码，如果不写在这两行之间的话会导致清空不掉相应的代码。
####========******####======== actions begin ========####******========#### ####========******####======== actions begin ========####******========####
run_upgrade_job(conn, cur, "3.1.3") run_upgrade_job(conn, cur, "3.1.4")
return return
####========******####========= actions end =========####******========#### ####========******####========= actions end =========####******========####

4
tools/upgrade/upgrade_post.py
View File

@ -6396,7 +6396,7 @@
##因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end ##因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end
##这两行之间的这些代码，如果不写在这两行之间的话会导致清空不掉相应的代码。 ##这两行之间的这些代码，如果不写在这两行之间的话会导致清空不掉相应的代码。
#####========******####======== actions begin ========####******========#### #####========******####======== actions begin ========####******========####
# run_upgrade_job(conn, cur, "3.1.3") # run_upgrade_job(conn, cur, "3.1.4")
# return # return
#####========******####========= actions end =========####******========#### #####========******####========= actions end =========####******========####
# #
@ -8686,7 +8686,7 @@
# #
#class UpgradeParams: #class UpgradeParams:
# log_filename = 'upgrade_post_checker.log' # log_filename = 'upgrade_post_checker.log'
# new_version = '3.1.3' # new_version = '3.1.4'
##### --------------start : my_error.py -------------- ##### --------------start : my_error.py --------------
#class MyError(Exception): #class MyError(Exception):
# def __init__(self, value): # def __init__(self, value):

2
tools/upgrade/upgrade_post_checker.py
View File

@ -12,7 +12,7 @@ import time
class UpgradeParams: class UpgradeParams:
log_filename = 'upgrade_post_checker.log' log_filename = 'upgrade_post_checker.log'
new_version = '3.1.3' new_version = '3.1.4'
#### --------------start : my_error.py -------------- #### --------------start : my_error.py --------------
class MyError(Exception): class MyError(Exception):
def __init__(self, value): def __init__(self, value):

4
tools/upgrade/upgrade_pre.py
View File

@ -6396,7 +6396,7 @@
##因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end ##因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end
##这两行之间的这些代码，如果不写在这两行之间的话会导致清空不掉相应的代码。 ##这两行之间的这些代码，如果不写在这两行之间的话会导致清空不掉相应的代码。
#####========******####======== actions begin ========####******========#### #####========******####======== actions begin ========####******========####
# run_upgrade_job(conn, cur, "3.1.3") # run_upgrade_job(conn, cur, "3.1.4")
# return # return
#####========******####========= actions end =========####******========#### #####========******####========= actions end =========####******========####
# #
@ -8686,7 +8686,7 @@
# #
#class UpgradeParams: #class UpgradeParams:
# log_filename = 'upgrade_post_checker.log' # log_filename = 'upgrade_post_checker.log'
# new_version = '3.1.3' # new_version = '3.1.4'
##### --------------start : my_error.py -------------- ##### --------------start : my_error.py --------------
#class MyError(Exception): #class MyError(Exception):
# def __init__(self, value): # def __init__(self, value):