init-ceph: fix systemd-run cant't start ceph daemon sometimes

Fixes: #13474
Signed-off-by: Chuanhong Wang <wang.chuanhong@zte.com.cn>
(cherry picked from commit 2f36909e1e08bac993e77d1781a777b386335669)

Conflicts:
	src/init-ceph.in
            different content of cmd variable

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 2ff98c7c21af3a6f55b9cb368f4f807362f57c51..d558463ba0a1b48f45640e3205947908774d9dce 100644 (file)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -304,7 +304,8 @@ for name in $what; do
            [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
 
            if [ -n "$SYSTEMD_RUN" ]; then
-               cmd="$SYSTEMD_RUN -r bash -c '$files $cmd --cluster $cluster -f'"
+                time=`date +%s.%N` 
+               cmd="$SYSTEMD_RUN --unit=ceph-$name.$time -r bash -c '$files $cmd --cluster $cluster -f'"
            else
                cmd="$files $wrap $cmd --cluster $cluster $runmode"
            fi