merge develop into master 20231220

2024-02-10 07:44:52 +00:00
parent 53a3cd6a19
commit ce4819685b
50 changed files with 861 additions and 65 deletions
--- a/src/share/ob_server_status.cpp
+++ b/src/share/ob_server_status.cpp
@ -24,7 +24,7 @@ int get_rs_status_str(const ObRootServiceStatus status,
                      const char *&str)
 {
  int ret = OB_SUCCESS;
-  static const char *strs[] = {"invalid", "init", "starting", "in_service", "full_service", "started",
+  static const char *strs[] = {"init", "starting", "in_service", "full_service", "started",
    "need_stop", "stopping", "max"};
  if (status < 0 || status >= MAX) {
    ret = OB_INVALID_ARGUMENT;