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

fix: correct bootstarp typo to bootstrap issue #121 (#124)

Browse Source 
* fix: correct bootstarp typo to bootstrap issue #121

* fix: remove misleading error message #137
This commit is contained in:
rgyu 2021-07-12 13:58:47 +08:00 committed by GitHub
parent d2f257f846
commit 01321d90c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/oblib/src/lib/utility/utility.cpp vendored
View File

@ -1149,8 +1149,7 @@ static int pidfile_test(const char* pidfile)
int ret = OB_SUCCESS;
int fd = open(pidfile, O_RDONLY);
if (fd < 0) {
LOG_ERROR("fid file doesn't exist", K(pidfile));
if (fd < 0) {
ret = OB_FILE_NOT_EXIST;
} else {
if (lockf(fd, F_TEST, 0) != 0) {

2
src/rootserver/ob_root_service.cpp
View File

@ -10685,7 +10685,7 @@ int ObRootService::update_table_schema_version(const ObUpdateTableSchemaVersionA
LOG_WARN("invalid schema service", KR(ret), KP(schema_service));
} else if (!schema_service->is_in_bootstrap()) {
ret = OB_OP_NOT_ALLOW;
LOG_WARN("not allow to update table schema while not in bootstarp");
LOG_WARN("not allow to update table schema while not in bootstrap");
} else if (OB_FAIL(
ddl_service_.get_tenant_schema_guard_with_version_in_inner_table(arg.tenant_id_, schema_guard))) {
LOG_WARN("get_schema_guard with version in inner table failed", K(ret), K(arg));

2
src/share/ob_cluster_info_proxy.cpp
View File

@ -283,7 +283,7 @@ int ObClusterInfoProxy::load(ObISQLClient& sql_proxy, ObClusterInfo& cluster_inf
LOG_WARN("fail to load core table", K(ret));
} else if (OB_FAIL(core_table.next())) {
if (OB_ITER_END == ret) {
LOG_WARN("get empty cluster info, maybe in bootstarp", K(ret));
LOG_WARN("get empty cluster info, maybe in bootstrap", K(ret));
ret = OB_SUCCESS;
} else {
LOG_WARN("fail to next", K(ret));

2
src/sql/session/ob_basic_session_info.cpp
View File

@ -937,7 +937,7 @@ int ObBasicSessionInfo::update_query_sensitive_system_variable(ObSchemaGetterGua
return ret;
}
// used for bootstarp, in which we can not get system variables from inner table.
// used for bootstrap, in which we can not get system variables from inner table.
int ObBasicSessionInfo::load_default_sys_variable(const bool print_info_log, const bool is_sys_tenant)
{
int ret = OB_SUCCESS;