Handle overflow error from license manager (vesoft-inc#2590)

* Handle overflow error in HB * Fix resource limit * Remove legacy license * Remove legacy license and fix hb logic * Modify log * Remove license from test cluster set up --------- Co-authored-by: Sophie <[email protected]>
yixinglu · Apr 12, 2023 · de4fb65 · de4fb65
1 parent 38a7e66
commit de4fb65
Show file tree

Hide file tree

Showing 65 changed files with 167 additions and 2,298 deletions.
diff --git a/.github/workflows/decrypt_secret.sh b/.github/workflows/decrypt_secret.sh
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -248,10 +248,6 @@ jobs:
         run: |
           [ -d build/ ] && rm -rf build/* || mkdir -p build
           make init -C tests
-      - name: Decrypt License
-        run: sh ./.github/workflows/decrypt_secret.sh
-        env:
-          SECRET_PASSPHRASE: ${{ secrets.LICENSE_PASSWORD }}
       - name: CMake
         id: cmake
         run: |

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -98,10 +98,6 @@ jobs:
         run: |
           [ -d build/ ] && rm -rf build/* || mkdir -p build
           make init -C tests
-      - name: Decrypt License
-        run: sh ./.github/workflows/decrypt_secret.sh
-        env:
-          SECRET_PASSPHRASE: ${{ secrets.LICENSE_PASSWORD }}
       - name: CMake
         id: cmake
         run: |

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -305,10 +305,6 @@ jobs:
         run: |
           [ -d build/ ] && rm -rf build/* || mkdir -p build
           make init -C tests
-      - name: Decrypt License
-        run: sh ./.github/workflows/decrypt_secret.sh
-        env:
-          SECRET_PASSPHRASE: ${{ secrets.LICENSE_PASSWORD }}
       - name: CMake
         id: cmake
         run: |

diff --git a/.gitignore b/.gitignore
@@ -68,5 +68,3 @@ venv/
 #ctags
 .tags
 /.vs
-#license
-tests/secrets/nebula.license
diff --git a/conf/nebula-metad.conf.default b/conf/nebula-metad.conf.default
@@ -3,7 +3,6 @@
 --daemonize=true
 # The file to host the process id
 --pid_file=pids/nebula-metad.pid
---license_path=share/resources/nebula.license
 
 ########## enterprise license ##########
 # The address of license manager in format of ip:port

diff --git a/conf/nebula-metad.conf.production b/conf/nebula-metad.conf.production
@@ -4,9 +4,6 @@
 # The file to host the process id
 --pid_file=pids/nebula-metad.pid
 
-# TODO(Aiee): remove this option
---license_path=share/resources/nebula.license
-
 ########## enterprise license ##########
 # The address of license manager in format of ip:port
 --license_manager_url=license.vesoft-inc.com:9119

diff --git a/conf/nebula-standalone.conf.default b/conf/nebula-standalone.conf.default
@@ -3,7 +3,6 @@
 --daemonize=true
 # The file to host the process id
 --pid_file=pids/nebula-standalone.pid
---license_path=share/resources/nebula.license
 # Whether to enable optimizer
 --enable_optimizer=true
 # The default charset when a space is created

diff --git a/conf/nebula-standalone.conf.production b/conf/nebula-standalone.conf.production
@@ -3,7 +3,6 @@
 --daemonize=true
 # The file to host the process id
 --pid_file=pids/nebula-standalone.pid
---license_path=share/resources/nebula.license
 # Whether to enable optimizer
 --enable_optimizer=true
 # The default charset when a space is created

diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -1329,17 +1329,17 @@ Status MetaClient::handleResponse(const RESP& resp) {
       LOG(ERROR) << "[License Manager] The number of nodes exceeds the limit, shutting down the "
                     "current node!";
       std::raise(SIGTERM);
-      return Status::Error(" Nodes number exceeds the limit!");
+      return Status::Error("The number of nodes exceeds the limit!");
     }
     case nebula::cpp2::ErrorCode::E_TOTAL_CPU_CORE_EXCEED_LIMIT: {
       LOG(ERROR) << "[License Manager] The number of CPU cores exceeds the limit, shutting down "
                     "the current node!";
       std::raise(SIGTERM);
-      return Status::Error(" Cpu cores exceeds the limit!");
+      return Status::Error("The number of CPU cores exceeds the limit!");
     }
     case nebula::cpp2::ErrorCode::E_INVALID_LICENSE_MANAGER_STATUS: {
-      LOG(ERROR)
-          << "[License Manager] Invalid license manager status, shutting down the current node!";
+      LOG(ERROR) << "[License Manager] Invalid license manager status, shutting down the current "
+                    "node, please check the license manager status!";
       std::raise(SIGTERM);
       return Status::Error(" Invalid license manager status!");
     }

diff --git a/src/codec/test/CMakeLists.txt b/src/codec/test/CMakeLists.txt
@@ -15,8 +15,6 @@ set(expression_dep_libs
     $<TARGET_OBJECTS:thread_obj>
     $<TARGET_OBJECTS:file_based_cluster_id_man_obj>
     $<TARGET_OBJECTS:version_obj>
-    $<TARGET_OBJECTS:encryption_obj>
-    $<TARGET_OBJECTS:network_obj>
     $<TARGET_OBJECTS:conf_obj>
     $<TARGET_OBJECTS:fs_obj>
     $<TARGET_OBJECTS:time_utils_obj>

diff --git a/src/common/base/test/CMakeLists.txt b/src/common/base/test/CMakeLists.txt
@@ -114,8 +114,6 @@ set(expression_dep_libs
     $<TARGET_OBJECTS:thread_obj>
     $<TARGET_OBJECTS:file_based_cluster_id_man_obj>
     $<TARGET_OBJECTS:version_obj>
-    $<TARGET_OBJECTS:encryption_obj>
-    $<TARGET_OBJECTS:network_obj>
     $<TARGET_OBJECTS:conf_obj>
     $<TARGET_OBJECTS:fs_obj>
     $<TARGET_OBJECTS:time_utils_obj>

diff --git a/src/common/datatypes/test/CMakeLists.txt b/src/common/datatypes/test/CMakeLists.txt
@@ -42,8 +42,6 @@ set(expression_dep_libs
     $<TARGET_OBJECTS:thread_obj>
     $<TARGET_OBJECTS:file_based_cluster_id_man_obj>
     $<TARGET_OBJECTS:version_obj>
-    $<TARGET_OBJECTS:encryption_obj>
-    $<TARGET_OBJECTS:network_obj>
     $<TARGET_OBJECTS:conf_obj>
     $<TARGET_OBJECTS:fs_obj>
     $<TARGET_OBJECTS:time_utils_obj>

diff --git a/src/common/encryption/CMakeLists.txt b/src/common/encryption/CMakeLists.txt
@@ -2,11 +2,6 @@
 #
 # This source code is licensed under Apache 2.0 License.
 
-nebula_add_library(
-    encryption_obj OBJECT
-    License.cpp
-)
-
 nebula_add_library(
     encryption_utils_obj OBJECT
     EncryptionUtils.cpp

diff --git a/src/common/encryption/LMConnectorStatus.h b/src/common/encryption/LMConnectorStatus.h
@@ -105,6 +105,12 @@ struct LMStatusHelper {
       return "Unknown";
     }
   }
+
+  // Overflow is considered normal, because it returns the maximum possible usage
+  static bool isStatusNormal(LMStatus status) {
+    return status == LMStatus::Ready || status == LMStatus::Expiring ||
+           status == LMStatus::Expired || status == LMStatus::Overflow;
+  }
 };
 
 }  // namespace nebula
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,5 +68,3 @@ venv/ @@
     #ctags
     .tags
     /.vs
-    #license
-    tests/secrets/nebula.license