From 95964bffaa46bbca0cfb2144500977234e8c0572 Mon Sep 17 00:00:00 2001
From: lvcong_oh <lvcong@huawei.com>
Date: Sat, 28 Jun 2025 17:14:44 +0800
Subject: [PATCH] add dfx info

Signed-off-by: lvcong_oh <lvcong@huawei.com>
---
 .../framework/include/dfx/dfx_types.h                 |  1 +
 .../service/cloud/cloud_service_impl.cpp              | 11 +++++++++++
 .../service/rdb/rdb_general_store.cpp                 |  5 ++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/services/distributeddataservice/framework/include/dfx/dfx_types.h b/services/distributeddataservice/framework/include/dfx/dfx_types.h
index bb1a0e91d..a83fd2529 100644
--- a/services/distributeddataservice/framework/include/dfx/dfx_types.h
+++ b/services/distributeddataservice/framework/include/dfx/dfx_types.h
@@ -88,6 +88,7 @@ enum class Fault {
     CSF_DOWNLOAD_ASSETS                     = 82,
     CSF_GS_CREATE_DISTRIBUTED_TABLE         = 83,
     CSF_GS_CLOUD_SYNC                       = 84,
+    CSF_GS_CLOUD_CLEAN                      = 85,
 };
 
 enum class FaultType {
diff --git a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
index 75c4ae326..fce1de0ba 100644
--- a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
+++ b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
@@ -68,6 +68,7 @@ static constexpr const char *FT_ENABLE_CLOUD = "ENABLE_CLOUD";
 static constexpr const char *FT_DISABLE_CLOUD = "DISABLE_CLOUD";
 static constexpr const char *FT_SWITCH_ON = "SWITCH_ON";
 static constexpr const char *FT_SWITCH_OFF = "SWITCH_OFF";
+static constexpr const char *FT_CLOUD_CLEAN = "CLOUD_CLEAN";
 static constexpr const char *FT_QUERY_INFO = "QUERY_SYNC_INFO";
 static constexpr const char *FT_USER_CHANGE = "USER_CHANGE";
 static constexpr const char *FT_USER_UNLOCK = "USER_UNLOCK";
@@ -249,6 +250,7 @@ int32_t CloudServiceImpl::DoClean(const CloudInfo &cloudInfo, const std::map<std
         SchemaMeta schemaMeta;
         if (!MetaDataManager::GetInstance().LoadMeta(cloudInfo.GetSchemaKey(bundle), schemaMeta, true)) {
             ZLOGE("failed, no schema meta:bundleName:%{public}s", bundle.c_str());
+            Report(FT_CLOUD_CLEAN, Fault::CSF_GS_CLOUD_CLEAN, bundle, "get schema failed");
             continue;
         }
         DoClean(cloudInfo.user, schemaMeta, action);
@@ -287,6 +289,8 @@ void CloudServiceImpl::DoClean(int32_t user, const SchemaMeta &schemaMeta, int32
             ZLOGW("remove device data status:%{public}d, user:%{public}d, bundleName:%{public}s, "
                   "storeId:%{public}s",
                 status, static_cast<int>(user), meta.bundleName.c_str(), meta.GetStoreAlias().c_str());
+            Report(FT_CLOUD_CLEAN, Fault::CSF_GS_CLOUD_CLEAN, meta.bundleName, "Clean:" + std::to_string(status) +
+                ", storeId=" + meta.GetStoreAlias() + ", action=" + std::to_string(action));
         } else {
             ZLOGD("clean success, user:%{public}d, bundleName:%{public}s, storeId:%{public}s",
                 static_cast<int>(user), meta.bundleName.c_str(), meta.GetStoreAlias().c_str());
@@ -325,16 +329,21 @@ int32_t CloudServiceImpl::Clean(const std::string &id, const std::map<std::strin
     auto [status, cloudInfo] = GetCloudInfoFromMeta(user);
     if (status != SUCCESS) {
         ZLOGE("get cloud meta failed user:%{public}d", static_cast<int>(cloudInfo.user));
+        Report(FT_CLOUD_CLEAN, Fault::CSF_GS_CLOUD_CLEAN, "",
+            "get cloud info from meta failed=" + std::to_string(status));
         return ERROR;
     }
     if (id != cloudInfo.id) {
         ZLOGE("different id, [server] id:%{public}s, [meta] id:%{public}s", Anonymous::Change(cloudInfo.id).c_str(),
             Anonymous::Change(id).c_str());
+        Report(FT_CLOUD_CLEAN, Fault::CSF_GS_CLOUD_CLEAN, "",
+            "different id, new:" + Anonymous::Change(id) + ", old:" + Anonymous::Change(cloudInfo.id));
         return ERROR;
     }
     auto dbActions = ConvertAction(actions);
     if (dbActions.empty()) {
         ZLOGE("invalid actions. id:%{public}s", Anonymous::Change(cloudInfo.id).c_str());
+        Report(FT_CLOUD_CLEAN, Fault::CSF_GS_CLOUD_CLEAN, "", "convert action failed");
         return ERROR;
     }
     return DoClean(cloudInfo, dbActions);
@@ -881,6 +890,8 @@ bool CloudServiceImpl::UpdateCloudInfo(int32_t user, CloudSyncScene scene)
             actions[bundle] = GeneralStore::CleanMode::CLOUD_INFO;
         }
         DoClean(oldInfo, actions);
+        Report(GetDfxFaultType(scene), Fault::CSF_CLOUD_INFO, "",
+            "Clean: different id, new:" + Anonymous::Change(cloudInfo.id) + ", old:" + Anonymous::Change(oldInfo.id));
     }
     return true;
 }
diff --git a/services/distributeddataservice/service/rdb/rdb_general_store.cpp b/services/distributeddataservice/service/rdb/rdb_general_store.cpp
index 9455db59a..24add26ce 100644
--- a/services/distributeddataservice/service/rdb/rdb_general_store.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_general_store.cpp
@@ -943,13 +943,16 @@ int32_t RdbGeneralStore::SetDistributedTables(const std::vector<std::string> &ta
             ZLOGE("create distributed table failed, table:%{public}s, err:%{public}d",
                 Anonymous::Change(table).c_str(), dBStatus);
             Report(FT_OPEN_STORE, static_cast<int32_t>(Fault::CSF_GS_CREATE_DISTRIBUTED_TABLE),
-                "SetDistributedTables ret=" + std::to_string(static_cast<int32_t>(dBStatus)));
+                "SetDistributedTables: set table(" + Anonymous::Change(table) + ") reference=" +
+                std::to_string(static_cast<int32_t>(dBStatus)));
             return GeneralError::E_ERROR;
         }
     }
     if (type == DistributedTableType::DISTRIBUTED_CLOUD) {
         auto status = SetReference(references);
         if (status != GeneralError::E_OK) {
+            Report(FT_OPEN_STORE, static_cast<int32_t>(Fault::CSF_GS_CREATE_DISTRIBUTED_TABLE),
+                "SetDistributedTables: set reference=" + std::to_string(static_cast<int32_t>(status)));
             return GeneralError::E_ERROR;
         }
     }
-- 
Gitee