From 964a0fe9ba034dc779914654977598750c990e71 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Mon, 18 Nov 2024 16:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E5=A4=87=E4=BB=BD=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=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 | 5 ++++- .../src/module_external/bms_adapter.cpp | 1 + services/backup_sa/src/module_ipc/service.cpp | 4 ++-- .../src/module_ipc/service_incremental.cpp | 4 ++-- .../backup_sa/src/module_ipc/sub_service.cpp | 22 ++++++++++++++++++- tests/mock/module_ipc/service_mock.cpp | 6 ++++- .../module_ipc/service_incremental_test.cpp | 4 +++- 7 files changed, 38 insertions(+), 8 deletions(-) diff --git a/services/backup_sa/include/module_ipc/service.h b/services/backup_sa/include/module_ipc/service.h index a4d2c69d6..41106d44e 100644 --- a/services/backup_sa/include/module_ipc/service.h +++ b/services/backup_sa/include/module_ipc/service.h @@ -549,10 +549,13 @@ private: void CreateDirIfNotExist(const std::string &path); std::vector GetSupportBackupBundleNames(vector &bundleInfos, - bool isIncBackup); + bool isIncBackup, const vector &srcBundleNames); void RefreshBundleDataSize(const vector &newBundleInfos, std::string bundleName, wptr ptr); + + void HandleNotSupportBundleNames(const std::vector &srcBundleNames, + std::vector &supportBundleNames, bool isIncBackup); 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 26af6e970..7f94e2c27 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 cf65822f4..5b53f5796 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -795,7 +795,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(); @@ -837,7 +837,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 c0f47df3f..799549999 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -346,7 +346,7 @@ 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); @@ -385,7 +385,7 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vectorGetSessionUserId(), isClearDataFlags); auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundlesToBackup, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true, bundleNames); for (auto &bundleInfo : bundlesToBackup) { session_->SetIncrementalData(bundleInfo); } diff --git a/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index b269ace2a..3d066e9ff 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -293,7 +293,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; @@ -315,6 +315,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 f7a4f8761..0c93ef7ff 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -290,8 +290,12 @@ void Service::CreateDirIfNotExist(const std::string &path) } void Service::StartRunningTimer(const std::string &bundleName) {} -std::vector Service::GetSupportBackupBundleNames(vector&, bool) + +std::vector Service::GetSupportBackupBundleNames(vector&, bool, + const vector&) { return {}; } + +void Service::HandleNotSupportBundleNames(const vector&, vector&, bool) {} } // namespace OHOS::FileManagement::Backup diff --git a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp index 677feb583..218fa62c9 100644 --- a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp @@ -245,7 +245,9 @@ void Service::UpdateFailedBundles(const std::string &bundleName, BundleTaskInfo void Service::ClearFailedBundles() {} void Service::StartRunningTimer(const std::string &bundleName) {} -std::vector Service::GetSupportBackupBundleNames(vector&, bool) + +std::vector Service::GetSupportBackupBundleNames(vector&, bool, + const vector&) { return {}; } -- Gitee