From b97bcbc51afa4062b0e89a5737118ee02c745890 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Wed, 27 Nov 2024 14:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E5=8A=A0=E5=9B=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../backup_sa/include/module_ipc/service.h | 16 ++++++++---- .../src/module_external/bms_adapter.cpp | 1 + services/backup_sa/src/module_ipc/service.cpp | 4 +-- .../src/module_ipc/service_incremental.cpp | 26 +++++++++++++------ .../backup_sa/src/module_ipc/sub_service.cpp | 22 +++++++++++++++- tests/mock/module_ipc/service_mock.cpp | 8 +++++- 6 files changed, 60 insertions(+), 17 deletions(-) diff --git a/services/backup_sa/include/module_ipc/service.h b/services/backup_sa/include/module_ipc/service.h index 87afdaaeb..7f1b3681e 100644 --- a/services/backup_sa/include/module_ipc/service.h +++ b/services/backup_sa/include/module_ipc/service.h @@ -518,15 +518,15 @@ private: void TimeoutRadarReport(IServiceReverse::Scenario scenario, std::string &bundleName); void CreateDirIfNotExist(const std::string &path); - + void OnBundleStarted(BError error, sptr session, const BundleName &bundleName); void HandleExceptionOnAppendBundles(sptr session, const vector &appendBundleNames, const vector &restoreBundleNames); - + void BundleBeginRadarReport(const std::string &bundleName, const ErrCode errCode, const IServiceReverse::Scenario scenario); - + void BundleEndRadarReport(const std::string &bundleName, const ErrCode errCode, const IServiceReverse::Scenario scenario); @@ -535,12 +535,18 @@ private: void ExtensionConnectFailRadarReport(const std::string &bundleName, const ErrCode errCode, const IServiceReverse::Scenario scenario); - + void UpdateFailedBundles(const std::string &bundleName, BundleTaskInfo taskInfo); void ClearFailedBundles(); std::vector GetSupportBackupBundleNames(vector &bundleInfos, - bool isIncBackup); + bool isIncBackup, const vector &srcBundleNames); + + void HandleNotSupportBundleNames(const std::vector &srcBundleNames, + std::vector &supportBundleNames, bool isIncBackup); + + void SetBundleIncDataInfo(const std::vector &bundlesToBackup, + std::vector &supportBundleNames); private: static sptr instance_; static std::mutex instanceLock_; diff --git a/services/backup_sa/src/module_external/bms_adapter.cpp b/services/backup_sa/src/module_external/bms_adapter.cpp index 33d21e327..71d2c9847 100644 --- a/services/backup_sa/src/module_external/bms_adapter.cpp +++ b/services/backup_sa/src/module_external/bms_adapter.cpp @@ -304,6 +304,7 @@ vector BundleMgrAdapter::GetBundleInfosForIncrement } if (!CreateIPCInteractionFiles(userId, bundleName, bundleNameTime.lastIncrementalTime, backupPara.includes, backupPara.excludes)) { + HILOGE("Create bundleInteraction dir failed, bundleName:%{public}s", bundleName.c_str()); continue; } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo {installedBundle.name, installedBundle.appIndex, diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 54ff81a8f..781204f52 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -788,7 +788,7 @@ ErrCode Service::AppendBundlesBackupSession(const vector &bundleName VerifyCaller(IServiceReverse::Scenario::BACKUP); auto bundleDetails = MakeDetailList(bundleNames); auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundleDetails, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, false); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, false, bundleNames); session_->AppendBundles(supportBackupNames); SetCurrentBackupSessProperties(supportBackupNames, session_->GetSessionUserId(), backupInfos, false); OnStartSched(); @@ -830,7 +830,7 @@ ErrCode Service::AppendBundlesDetailsBackupSession(const vector &bun session_->GetSessionUserId(), isClearDataFlags); auto bundleDetails = MakeDetailList(bundleNames); auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundleDetails, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, false); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, false, bundleNames); session_->AppendBundles(supportBackupNames); HandleCurGroupBackupInfos(backupInfos, bundleNameDetailMap, isClearDataFlags); OnStartSched(); diff --git a/services/backup_sa/src/module_ipc/service_incremental.cpp b/services/backup_sa/src/module_ipc/service_incremental.cpp index b948183b4..c9affd794 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -322,11 +322,9 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector bundleNames = GetBundleNameByDetails(bundlesToBackup); auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundlesToBackup, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true, bundleNames); session_->AppendBundles(supportBackupNames); - for (auto &bundleInfo : bundlesToBackup) { - session_->SetIncrementalData(bundleInfo); - } + SetBundleIncDataInfo(bundlesToBackup, supportBackupNames); SetCurrentBackupSessProperties(supportBackupNames, session_->GetSessionUserId(), backupInfos, true); OnStartSched(); session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); @@ -364,10 +362,8 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vectorGetSessionUserId(), isClearDataFlags); auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundlesToBackup, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true); - for (auto &bundleInfo : bundlesToBackup) { - session_->SetIncrementalData(bundleInfo); - } + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true, bundleNames); + SetBundleIncDataInfo(bundlesToBackup, supportBackupNames); session_->AppendBundles(supportBackupNames); HandleCurGroupIncBackupInfos(backupInfos, bundleNameDetailMap, isClearDataFlags); OnStartSched(); @@ -717,4 +713,18 @@ void Service::SetCurrentBackupSessProperties(const vector &bundleNames, } HILOGI("end SetCurrentBackupSessProperties"); } + +void Service::SetBundleIncDataInfo(const std::vector& bundlesToBackup, + std::vector& supportBundleNames) +{ + for (auto &bundleInfo : bundlesToBackup) { + std::string bundleName = bundleInfo.bundleName; + auto it = std::find(supportBundleNames.begin(), supportBundleNames.end(), bundleName); + if (it == supportBundleNames.end()) { + HILOGE("Current bundle is not support to backup, bundleName:%{public}s", bundleName.c_str()); + continue; + } + session_->SetIncrementalData(bundleInfo); + } +} } // namespace OHOS::FileManagement::Backup diff --git a/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index 96c10ca86..7d3fc2387 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -289,7 +289,7 @@ void Service::SetWant(AAFwk::Want &want, const BundleName &bundleName, const BCo } std::vector Service::GetSupportBackupBundleNames(vector &backupInfos, - bool isIncBackup) + bool isIncBackup, const std::vector &srcBundleNames) { HILOGI("Begin"); std::vector supportBackupNames; @@ -311,6 +311,7 @@ std::vector Service::GetSupportBackupBundleNames(vector &srcBundleNames, + std::vector &supportBundleNames, bool isIncBackup) +{ + for (auto bundleName : srcBundleNames) { + auto it = std::find(supportBundleNames.begin(), supportBundleNames.end(), bundleName); + if (it != supportBundleNames.end()) { + continue; + } + HILOGE("bundleName:%{public}s, can not find from supportBundleNames", bundleName.c_str()); + if (isIncBackup) { + session_->GetServiceReverseProxy()->IncrementalBackupOnBundleStarted( + BError(BError::Codes::SA_BUNDLE_INFO_EMPTY), bundleName); + } else { + session_->GetServiceReverseProxy()->BackupOnBundleStarted( + BError(BError::Codes::SA_BUNDLE_INFO_EMPTY), bundleName); + } + } +} } \ No newline at end of file diff --git a/tests/mock/module_ipc/service_mock.cpp b/tests/mock/module_ipc/service_mock.cpp index 3fdca2e86..d76092cd4 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -288,8 +288,14 @@ void Service::ExtensionConnectFailRadarReport(const std::string &bundleName, con void Service::UpdateFailedBundles(const std::string &bundleName, BundleTaskInfo taskInfo) {} void Service::ClearFailedBundles() {} -std::vector Service::GetSupportBackupBundleNames(vector&, bool) + +std::vector Service::GetSupportBackupBundleNames(vector&, bool, + const vector&) { return {}; } + +void Service::HandleNotSupportBundleNames(const vector&, vector&, bool) {} + +void Service::SetBundleIncDataInfo(const std::vector&, std::vector&) {} } // namespace OHOS::FileManagement::Backup -- Gitee