From c4b032682781486ae9b7af1efe75fa82cdbf5f59 Mon Sep 17 00:00:00 2001
From: xianghengliang <xianghengliang1@huawei.com>
Date: Thu, 10 Feb 2022 16:08:03 +0800
Subject: [PATCH 1/2] dfs_service boot start failed bugfix

Signed-off-by: xianghengliang <xianghengliang1@huawei.com>
---
 services/4901.xml                                      |  4 ++--
 services/4902.xml                                      |  4 ++--
 services/distributedfile.cfg                           |  2 +-
 .../src/device/device_manager_agent.cpp                | 10 ++--------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/services/4901.xml b/services/4901.xml
index 746f452eb..eb428fb2b 100755
--- a/services/4901.xml
+++ b/services/4901.xml
@@ -18,8 +18,8 @@
     <systemability>        <!-- Declare a sytem ability and its profile -->
         <name>4901</name>        <!-- Declare the name of system ability -->
         <libpath>libdistributedfiledaemon.z.so</libpath>        <!-- Declare the path of .so file which includes the system ability; Note: 1 .so file can have 1 to N system abilities. -->
-        <!--<depend></depend> -->        <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
-        <!--<depend-time-out></depend-time-out> -->        <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
+        <depend>4802;4700</depend>       <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
+        <depend-time-out>60000</depend-time-out>        <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
         <run-on-create>true</run-on-create>        <!-- "true" means the system ability would start imediately, "false" means the system ability would start on demand. -->
         <distributed>false</distributed>        <!-- "true" means the system ability supports distributed scheduling while "false" is not. -->
         <dump-level>1</dump-level>        <!-- Declare the dump level. 1-high; 2-media; 3-low -->
diff --git a/services/4902.xml b/services/4902.xml
index 89e4c712c..9dc4f0d70 100644
--- a/services/4902.xml
+++ b/services/4902.xml
@@ -18,8 +18,8 @@
     <systemability>        <!-- Declare a sytem ability and its profile -->
         <name>4902</name>        <!-- Declare the name of system ability -->
         <libpath>libdistributedfileservice.z.so</libpath>        <!-- Declare the path of .so file which includes the system ability; Note: 1 .so file can have 1 to N system abilities. -->
-        <!--<depend></depend> -->        <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
-        <!--<depend-time-out></depend-time-out> -->        <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
+        <depend>4802;4700</depend>         <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
+        <depend-time-out>60000</depend-time-out>      <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
         <run-on-create>true</run-on-create>        <!-- "true" means the system ability would start imediately, "false" means the system ability would start on demand. -->
         <distributed>false</distributed>        <!-- "true" means the system ability supports distributed scheduling while "false" is not. -->
         <dump-level>1</dump-level>        <!-- Declare the dump level. 1-high; 2-media; 3-low -->
diff --git a/services/distributedfile.cfg b/services/distributedfile.cfg
index 442e2113f..5059aaf2a 100644
--- a/services/distributedfile.cfg
+++ b/services/distributedfile.cfg
@@ -21,7 +21,7 @@
         "name": "distributedfiledaemon",
         "path": ["/system/bin/sa_main", "/system/profile/distributedfiledaemon.xml"],
         "uid": "system",
-        "gid": ["system"],
+        "gid": ["system", "dfs"],
         "caps": ["SYS_PTRACE", "KILL"]
     }]
 }
diff --git a/services/distributedfiledaemon/src/device/device_manager_agent.cpp b/services/distributedfiledaemon/src/device/device_manager_agent.cpp
index 2921acb4f..090088e8d 100644
--- a/services/distributedfiledaemon/src/device/device_manager_agent.cpp
+++ b/services/distributedfiledaemon/src/device/device_manager_agent.cpp
@@ -58,14 +58,8 @@ void DeviceManagerAgent::StopInstance()
 
 void DeviceManagerAgent::Start()
 {
-    try {
-        RegisterToExternalDm();
-        InitLocalNodeInfo();
-    } catch (const Exception &e) {
-        LOGE("interacting with devicemanager failed, err code %{public}d", e.code());
-    } catch (const std::exception &e) {
-        LOGE("Unexpect Low Level exception");
-    }
+    RegisterToExternalDm();
+    InitLocalNodeInfo();
 }
 
 void DeviceManagerAgent::Stop()
-- 
Gitee


From d746839403bda7fd1c5644c6be223f93d36a5028 Mon Sep 17 00:00:00 2001
From: xianghengliang <xianghengliang1@huawei.com>
Date: Thu, 10 Feb 2022 17:35:03 +0800
Subject: [PATCH 2/2] add dfs_service gid

Signed-off-by: xianghengliang <xianghengliang1@huawei.com>
---
 services/distributedfile.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/distributedfile.cfg b/services/distributedfile.cfg
index 5059aaf2a..df4ae9698 100644
--- a/services/distributedfile.cfg
+++ b/services/distributedfile.cfg
@@ -15,7 +15,7 @@
         "name": "distributedfileservice",
         "path": ["/system/bin/sa_main", "/system/profile/distributedfileservice.xml"],
         "uid": "system",
-        "gid": ["system"],
+        "gid": ["system", "dfs"],
         "caps": ["SYS_PTRACE", "KILL"]
     },{
         "name": "distributedfiledaemon",
-- 
Gitee