From 01321d90c7fa5ea47ae5a90d1320e066fed1558a Mon Sep 17 00:00:00 2001
From: rgyu <needlepeak@outlook.com>
Date: Mon, 12 Jul 2021 13:58:47 +0800
Subject: [PATCH] fix: correct bootstarp typo to bootstrap issue #121 (#124)

* fix: correct bootstarp typo to bootstrap issue #121

* fix: remove misleading error message #137
---
 deps/oblib/src/lib/utility/utility.cpp    | 3 +--
 src/rootserver/ob_root_service.cpp        | 2 +-
 src/share/ob_cluster_info_proxy.cpp       | 2 +-
 src/sql/session/ob_basic_session_info.cpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/deps/oblib/src/lib/utility/utility.cpp b/deps/oblib/src/lib/utility/utility.cpp
index 02cdaed974..6e18fd880c 100644
--- a/deps/oblib/src/lib/utility/utility.cpp
+++ b/deps/oblib/src/lib/utility/utility.cpp
@@ -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) {
diff --git a/src/rootserver/ob_root_service.cpp b/src/rootserver/ob_root_service.cpp
index 29ef615df9..fcb4fd50c7 100644
--- a/src/rootserver/ob_root_service.cpp
+++ b/src/rootserver/ob_root_service.cpp
@@ -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));
diff --git a/src/share/ob_cluster_info_proxy.cpp b/src/share/ob_cluster_info_proxy.cpp
index 3fd1789ebb..03ece62ad5 100644
--- a/src/share/ob_cluster_info_proxy.cpp
+++ b/src/share/ob_cluster_info_proxy.cpp
@@ -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));
diff --git a/src/sql/session/ob_basic_session_info.cpp b/src/sql/session/ob_basic_session_info.cpp
index ae599087b2..d053cba66b 100644
--- a/src/sql/session/ob_basic_session_info.cpp
+++ b/src/sql/session/ob_basic_session_info.cpp
@@ -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;
-- 
GitLab