From cb6587d34f97d63f0f3d9af175a09148cd2c8b68 Mon Sep 17 00:00:00 2001
From: Hollokin <taoyuxin2@huawei.com>
Date: Tue, 1 Jul 2025 16:43:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E4=BA=91=E6=96=B0=E5=A2=9E=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=E6=89=93=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hollokin <taoyuxin2@huawei.com>
---
 .../framework/include/dfx/dfx_types.h         |  1 +
 .../service/cloud/cloud_service_impl.cpp      | 21 ++++++++++++-------
 .../service/cloud/cloud_service_impl.h        | 11 ++++++++--
 .../service/rdb/rdb_general_store.cpp         |  2 ++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/services/distributeddataservice/framework/include/dfx/dfx_types.h b/services/distributeddataservice/framework/include/dfx/dfx_types.h
index bb1a0e91d..b07175ee1 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_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..9821b9bd7 100644
--- a/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
+++ b/services/distributeddataservice/service/cloud/cloud_service_impl.cpp
@@ -75,6 +75,7 @@ static constexpr const char *FT_NETWORK_RECOVERY = "NETWORK_RECOVERY";
 static constexpr const char *FT_SERVICE_INIT = "SERVICE_INIT";
 static constexpr const char *FT_SYNC_TASK = "SYNC_TASK";
 static constexpr const char *FT_ENCRYPT_CHANGED = "ENCRYPT_CHANGED";
+static constexpr const char *FT_CLEAN = "CLEAN";
 static constexpr const char *CLOUD_SCHEMA = "arkdata/cloud/cloud_schema.json";
 __attribute__((used)) CloudServiceImpl::Factory CloudServiceImpl::factory_;
 const CloudServiceImpl::SaveStrategy CloudServiceImpl::STRATEGY_SAVERS[Strategy::STRATEGY_BUTT] = {
@@ -238,7 +239,8 @@ int32_t CloudServiceImpl::ChangeAppSwitch(const std::string &id, const std::stri
     return SUCCESS;
 }
 
-int32_t CloudServiceImpl::DoClean(const CloudInfo &cloudInfo, const std::map<std::string, int32_t> &actions)
+int32_t CloudServiceImpl::DoClean(
+    const CloudInfo &cloudInfo, const std::map<std::string, int32_t> &actions, CleanScene cleanScene)
 {
     syncManager_.StopCloudSync(cloudInfo.user);
     for (const auto &[bundle, action] : actions) {
@@ -251,12 +253,12 @@ int32_t CloudServiceImpl::DoClean(const CloudInfo &cloudInfo, const std::map<std
             ZLOGE("failed, no schema meta:bundleName:%{public}s", bundle.c_str());
             continue;
         }
-        DoClean(cloudInfo.user, schemaMeta, action);
+        DoClean(cloudInfo.user, schemaMeta, action, cleanScene);
     }
     return SUCCESS;
 }
 
-void CloudServiceImpl::DoClean(int32_t user, const SchemaMeta &schemaMeta, int32_t action)
+void CloudServiceImpl::DoClean(int32_t user, const SchemaMeta &schemaMeta, int32_t action, CleanScene cleanScene)
 {
     StoreMetaData meta;
     meta.bundleName = schemaMeta.bundleName;
@@ -287,6 +289,9 @@ 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_CLEAN, Fault::CSF_CLEAN, "",
+                "cloud driver clean failed, cleanScene=" + std::to_string(static_cast<int32_t>(cleanScene)) +
+                ",action=" + std::to_string(action) + ",user =" + std::to_string(user));
         } 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());
@@ -330,6 +335,8 @@ int32_t CloudServiceImpl::Clean(const std::string &id, const std::map<std::strin
     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_CLEAN, Fault::CSF_CLEAN, "", "Clean failed, different id, [server] id=" +
+            Anonymous::Change(cloudInfo.id) + ",[meta] id=" + Anonymous::Change(id));
         return ERROR;
     }
     auto dbActions = ConvertAction(actions);
@@ -337,7 +344,7 @@ int32_t CloudServiceImpl::Clean(const std::string &id, const std::map<std::strin
         ZLOGE("invalid actions. id:%{public}s", Anonymous::Change(cloudInfo.id).c_str());
         return ERROR;
     }
-    return DoClean(cloudInfo, dbActions);
+    return DoClean(cloudInfo, dbActions, CleanScene::CLOUD_DRIVER_CLEAN);
 }
 
 int32_t CloudServiceImpl::CheckNotifyConditions(const std::string &id, const std::string &bundleName,
@@ -728,7 +735,7 @@ bool CloudServiceImpl::CleanWaterVersion(int32_t user)
             if (!found) {
                 continue;
             }
-            DoClean(user, schemaMeta, GeneralStore::CleanMode::CLEAN_WATER);
+            DoClean(user, schemaMeta, GeneralStore::CleanMode::CLEAN_WATER, CleanScene::CLEAN_WATER);
             schemaMeta.metaVersion = SchemaMeta::CLEAN_WATER_VERSION;
         }
         MetaDataManager::GetInstance().SaveMeta(key, schemaMeta, true);
@@ -880,7 +887,7 @@ bool CloudServiceImpl::UpdateCloudInfo(int32_t user, CloudSyncScene scene)
             MetaDataManager::GetInstance().DelMeta(Subscription::GetRelationKey(user, bundle), true);
             actions[bundle] = GeneralStore::CleanMode::CLOUD_INFO;
         }
-        DoClean(oldInfo, actions);
+        DoClean(oldInfo, actions, CleanScene::DIFFERENT_ID);
     }
     return true;
 }
@@ -1002,7 +1009,7 @@ void CloudServiceImpl::UpgradeSchemaMeta(int32_t user, const SchemaMeta &schemaM
     if (SchemaMeta::GetHighVersion(schemaMeta.metaVersion) != SchemaMeta::GetHighVersion()) {
         ZLOGI("start clean. user:%{public}d, bundleName:%{public}s, metaVersion:%{public}d", user,
             schemaMeta.bundleName.c_str(), schemaMeta.metaVersion);
-        DoClean(user, schemaMeta, GeneralStore::CleanMode::CLOUD_INFO);
+        DoClean(user, schemaMeta, GeneralStore::CleanMode::CLOUD_INFO, CleanScene::SCHEMA_UPGRADE);
     }
 }
 
diff --git a/services/distributeddataservice/service/cloud/cloud_service_impl.h b/services/distributeddataservice/service/cloud/cloud_service_impl.h
index 4410519c1..82690ee1e 100644
--- a/services/distributeddataservice/service/cloud/cloud_service_impl.h
+++ b/services/distributeddataservice/service/cloud/cloud_service_impl.h
@@ -114,6 +114,13 @@ private:
         ACCOUNT_STOP = 9,
     };
 
+    enum class CleanScene {
+        CLOUD_DRIVER_CLEAN = 0,
+        DIFFERENT_ID = 1,
+        SCHEMA_UPGRADE = 2,
+        CLEAN_WATER = 3,
+    };
+
     using Database = DistributedData::Database;
     using CloudInfo = DistributedData::CloudInfo;
     using SchemaMeta = DistributedData::SchemaMeta;
@@ -184,8 +191,8 @@ private:
     void InitSubTask(const Subscription &sub, uint64_t minInterval = 0);
     void Execute(Task task);
     void CleanSubscription(Subscription &sub);
-    int32_t DoClean(const CloudInfo &cloudInfo, const std::map<std::string, int32_t> &actions);
-    void DoClean(int32_t user, const SchemaMeta &schemaMeta, int32_t action);
+    int32_t DoClean(const CloudInfo &cloudInfo, const std::map<std::string, int32_t> &actions, CleanScene cleanScene);
+    void DoClean(int32_t user, const SchemaMeta &schemaMeta, int32_t action, CleanScene cleanScene);
     std::pair<int32_t, std::shared_ptr<DistributedData::Cursor>> PreShare(
         const StoreInfo &storeInfo, DistributedData::GenQuery &query);
     std::vector<NativeRdb::ValuesBucket> ConvertCursor(std::shared_ptr<DistributedData::Cursor> cursor) const;
diff --git a/services/distributeddataservice/service/rdb/rdb_general_store.cpp b/services/distributeddataservice/service/rdb/rdb_general_store.cpp
index 4cfddd278..9d67df5db 100644
--- a/services/distributeddataservice/service/rdb/rdb_general_store.cpp
+++ b/services/distributeddataservice/service/rdb/rdb_general_store.cpp
@@ -907,6 +907,8 @@ int32_t RdbGeneralStore::SetReference(const std::vector<Reference> &references)
     auto status = delegate_->SetReference(properties);
     if (status != DistributedDB::DBStatus::OK && status != DistributedDB::DBStatus::PROPERTY_CHANGED) {
         ZLOGE("distributed table set reference failed, err:%{public}d", status);
+        Report(FT_OPEN_STORE, static_cast<int32_t>(Fault::CSF_GS_CREATE_DISTRIBUTED_TABLE),
+               "SetReference failed, dbError=" + std::to_string(static_cast<int32_t>(status)));
         return GeneralError::E_ERROR;
     }
     return GeneralError::E_OK;
-- 
Gitee