From 82df063506413183f8bed9d2f3c60f39dfcd0292 Mon Sep 17 00:00:00 2001
From: ninsmiracle <ninsmiracle@126.com>
Date: Wed, 23 Oct 2024 11:54:17 +0800
Subject: [PATCH] fix: pass complie

---
 src/meta/meta_backup_engine.cpp  | 13 +++++++------
 src/meta/meta_backup_service.cpp |  2 +-
 src/meta/meta_service.h          |  2 ++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/meta/meta_backup_engine.cpp b/src/meta/meta_backup_engine.cpp
index 7fc0a6baa4..17f2c25467 100644
--- a/src/meta/meta_backup_engine.cpp
+++ b/src/meta/meta_backup_engine.cpp
@@ -27,11 +27,12 @@
 #include "block_service/block_service.h"
 #include "block_service/block_service_manager.h"
 
+#include "absl/strings/string_view.h"
 #include "common/gpid.h"
 #include "common/json_helper.h"
 #include "common/replication.codes.h"
 #include "dsn.layer2_types.h"
-#include "meta/backup_engine.h"
+#include "meta_backup_engine.h"
 #include "meta/meta_backup_service.h"
 #include "meta/meta_data.h"
 #include "meta/meta_service.h"
@@ -93,7 +94,7 @@ void meta_backup_engine::init_backup(int32_t app_id,
 // ThreadPool: THREAD_POOL_DEFAULT
 void meta_backup_engine::start()
 {
-    ddebug_f("App[{}] start {} backup[{}] on {}, root_path = {}",
+    LOG_DEBUG("App[{}] start {} backup[{}] on {}, root_path = {}",
              _cur_backup.app_name,
              _is_periodic_backup ? "periodic" : "onetime",
              _cur_backup.backup_id,
@@ -101,7 +102,7 @@ void meta_backup_engine::start()
              _cur_backup.backup_path);
     error_code err = write_app_info();
     if (err != ERR_OK) {
-        derror_f("backup_id({}): backup meta data for app {} failed, error {}",
+        LOG_ERROR("backup_id({}): backup meta data for app {} failed, error {}",
                  _cur_backup.backup_id,
                  _cur_backup.app_id,
                  err);
@@ -109,7 +110,7 @@ void meta_backup_engine::start()
         return;
     }
     update_backup_item_on_remote_storage(backup_status::CHECKPOINTING);
-    FAIL_POINT_INJECT_F("meta_backup_engine_start", [](dsn::string_view) {});
+    FAIL_POINT_INJECT_F("meta_backup_engine_start", [](absl::string_view) {});
     for (auto i = 0; i < _backup_status.size(); ++i) {
         zauto_write_lock l(_lock);
         _backup_status[i] = backup_status::CHECKPOINTING;
@@ -375,9 +376,9 @@ void meta_backup_engine::write_backup_info()
 void meta_backup_engine::complete_current_backup()
 {
     {
-        zauto_lock l(_lock);
+        zauto_read_lock l(_lock);
         for (const auto &status : _backup_status) {
-            if (status.second != backup_status::COMPLETED) {
+            if (status != backup_status::SUCCEED) {
                 // backup for some partition was not finished.
                 return;
             }
diff --git a/src/meta/meta_backup_service.cpp b/src/meta/meta_backup_service.cpp
index fa6ee4bc8b..72e7395e2a 100644
--- a/src/meta/meta_backup_service.cpp
+++ b/src/meta/meta_backup_service.cpp
@@ -30,7 +30,7 @@
 #include "common/replication.codes.h"
 #include "common/replication_enums.h"
 #include "dsn.layer2_types.h"
-#include "meta/backup_engine.h"
+#include "meta_backup_engine.h"
 #include "meta/meta_data.h"
 #include "meta/meta_rpc_types.h"
 #include "meta/meta_state_service.h"
diff --git a/src/meta/meta_service.h b/src/meta/meta_service.h
index efec058640..dfbae32f10 100644
--- a/src/meta/meta_service.h
+++ b/src/meta/meta_service.h
@@ -89,6 +89,8 @@ namespace mss {
 struct meta_storage;
 } // namespace mss
 
+class backup_service;
+
 namespace test {
 class test_checker;
 }