Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
大炮V587
oceanbase
提交
8aa89364
O
oceanbase
项目概览
大炮V587
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8aa89364
编写于
6月 15, 2022
作者:
O
obdev
提交者:
wangzelin.wzl
6月 15, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
upgrade opensource release from 3.1.3 to 3.1.4
上级
c0d957eb
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
20 addition
and
13 deletion
+20
-13
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/RPM.cmake
cmake/RPM.cmake
+2
-2
src/share/ob_cluster_version.h
src/share/ob_cluster_version.h
+2
-1
src/share/ob_upgrade_utils.cpp
src/share/ob_upgrade_utils.cpp
+3
-1
src/share/ob_upgrade_utils.h
src/share/ob_upgrade_utils.h
+2
-1
src/share/parameter/ob_parameter_seed.ipp
src/share/parameter/ob_parameter_seed.ipp
+1
-1
tools/upgrade/oceanbase_upgrade_dep.yml
tools/upgrade/oceanbase_upgrade_dep.yml
+3
-0
tools/upgrade/special_upgrade_action_post.py
tools/upgrade/special_upgrade_action_post.py
+1
-1
tools/upgrade/upgrade_post.py
tools/upgrade/upgrade_post.py
+2
-2
tools/upgrade/upgrade_post_checker.py
tools/upgrade/upgrade_post_checker.py
+1
-1
tools/upgrade/upgrade_pre.py
tools/upgrade/upgrade_pre.py
+2
-2
未找到文件。
CMakeLists.txt
浏览文件 @
8aa89364
...
...
@@ -4,7 +4,7 @@ include(cmake/Utils.cmake)
include
(
cmake/Env.cmake
)
project
(
"OceanBase CE"
VERSION 3.1.
3
VERSION 3.1.
4
DESCRIPTION
"OceanBase distributed database system"
HOMEPAGE_URL
"https://open.oceanbase.com/"
LANGUAGES CXX C ASM
)
...
...
cmake/RPM.cmake
浏览文件 @
8aa89364
...
...
@@ -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_DESCRIPTION_SUMMARY
"OceanBase CE is a distributed relational database"
)
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_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_URL
"https://open.oceanbase.com"
)
set
(
CPACK_RPM_PACKAGE_DESCRIPTION
"OceanBase CE is a distributed relational database"
)
...
...
src/share/ob_cluster_version.h
浏览文件 @
8aa89364
...
...
@@ -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_312 (oceanbase::common::cal_version(3, 1, 2))
#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
// FIXME If you update the above version, please update me, CLUSTER_CURRENT_VERSION & ObUpgradeChecker!!!!!!
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_31
3
#define CLUSTER_CURRENT_VERSION CLUSTER_VERSION_31
4
#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())
...
...
src/share/ob_upgrade_utils.cpp
浏览文件 @
8aa89364
...
...
@@ -32,7 +32,8 @@ namespace share {
const
uint64_t
ObUpgradeChecker
::
UPGRADE_PATH
[
CLUTER_VERSION_NUM
]
=
{
CALC_CLUSTER_VERSION
(
3UL
,
1UL
,
1UL
),
//3.1.1
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
)
...
...
@@ -1090,6 +1091,7 @@ int ObUpgradeProcesserSet::init(ObBaseUpgradeProcessor::UpgradeMode mode, common
INIT_PROCESSOR_BY_VERSION
(
3
,
1
,
1
);
INIT_PROCESSOR_BY_VERSION
(
3
,
1
,
2
);
INIT_PROCESSOR_BY_VERSION
(
3
,
1
,
3
);
INIT_PROCESSOR_BY_VERSION
(
3
,
1
,
4
);
#undef INIT_PROCESSOR_BY_VERSION
inited_
=
true
;
}
...
...
src/share/ob_upgrade_utils.h
浏览文件 @
8aa89364
...
...
@@ -181,7 +181,7 @@ public:
static
bool
check_cluster_version_exist
(
const
uint64_t
version
);
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
];
};
...
...
@@ -233,6 +233,7 @@ DEF_SIMPLE_UPGRARD_PROCESSER(3, 1, 0);
DEF_SIMPLE_UPGRARD_PROCESSER
(
3
,
1
,
1
);
DEF_SIMPLE_UPGRARD_PROCESSER
(
3
,
1
,
2
);
DEF_SIMPLE_UPGRARD_PROCESSER
(
3
,
1
,
3
);
DEF_SIMPLE_UPGRARD_PROCESSER
(
3
,
1
,
4
);
/* =========== upgrade processor end ============= */
...
...
src/share/parameter/ob_parameter_seed.ipp
浏览文件 @
8aa89364
...
...
@@ -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 "
"is permitted to execute before it is terminated. Range: [2s, 180s]",
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));
DEF_BOOL(enable_ddl, OB_CLUSTER_PARAMETER, "True",
"specifies whether DDL operation is turned on. "
...
...
tools/upgrade/oceanbase_upgrade_dep.yml
浏览文件 @
8aa89364
...
...
@@ -26,3 +26,6 @@
-
version
:
3.1.3
can_be_upgraded_to
:
-
3.1.4
-
version
:
3.1.4
can_be_upgraded_to
:
-
3.1.5
tools/upgrade/special_upgrade_action_post.py
浏览文件 @
8aa89364
...
...
@@ -17,7 +17,7 @@ def do_special_upgrade(conn, cur, tenant_id_list, user, pwd):
#因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end
#这两行之间的这些代码,如果不写在这两行之间的话会导致清空不掉相应的代码。
####========******####======== actions begin ========####******========####
run_upgrade_job
(
conn
,
cur
,
"3.1.
3
"
)
run_upgrade_job
(
conn
,
cur
,
"3.1.
4
"
)
return
####========******####========= actions end =========####******========####
...
...
tools/upgrade/upgrade_post.py
浏览文件 @
8aa89364
...
...
@@ -6396,7 +6396,7 @@
##因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end
##这两行之间的这些代码,如果不写在这两行之间的话会导致清空不掉相应的代码。
#####========******####======== actions begin ========####******========####
# run_upgrade_job(conn, cur, "3.1.
3
")
# run_upgrade_job(conn, cur, "3.1.
4
")
# return
#####========******####========= actions end =========####******========####
#
...
...
@@ -8686,7 +8686,7 @@
#
#class UpgradeParams:
# log_filename = 'upgrade_post_checker.log'
# new_version = '3.1.
3
'
# new_version = '3.1.
4
'
##### --------------start : my_error.py --------------
#class MyError(Exception):
# def __init__(self, value):
...
...
tools/upgrade/upgrade_post_checker.py
浏览文件 @
8aa89364
...
...
@@ -12,7 +12,7 @@ import time
class
UpgradeParams
:
log_filename
=
'upgrade_post_checker.log'
new_version
=
'3.1.
3
'
new_version
=
'3.1.
4
'
#### --------------start : my_error.py --------------
class
MyError
(
Exception
):
def
__init__
(
self
,
value
):
...
...
tools/upgrade/upgrade_pre.py
浏览文件 @
8aa89364
...
...
@@ -6396,7 +6396,7 @@
##因为基准版本更新的时候会调用reset_upgrade_scripts.py来清空actions begin和actions end
##这两行之间的这些代码,如果不写在这两行之间的话会导致清空不掉相应的代码。
#####========******####======== actions begin ========####******========####
# run_upgrade_job(conn, cur, "3.1.
3
")
# run_upgrade_job(conn, cur, "3.1.
4
")
# return
#####========******####========= actions end =========####******========####
#
...
...
@@ -8686,7 +8686,7 @@
#
#class UpgradeParams:
# log_filename = 'upgrade_post_checker.log'
# new_version = '3.1.
3
'
# new_version = '3.1.
4
'
##### --------------start : my_error.py --------------
#class MyError(Exception):
# def __init__(self, value):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录