From: wangchaunhong <root@A22832429.(none)>
Date: Tue, 20 Oct 2015 10:40:23 +0000 (+0800)
Subject: init-ceph: fix systemd-run cant't start ceph daemon sometimes
X-Git-Tag: v9.2.1~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6833%2Fhead;p=ceph.git

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)
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index faeb7bd76d6c..475769560a4c 100755
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -307,7 +307,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 --setuser ceph --setgroup ceph -f'"
+                time=`date +%s.%N` 
+		cmd="$SYSTEMD_RUN --unit=ceph-$name.$time -r bash -c '$files $cmd --cluster $cluster --setuser ceph --setgroup ceph -f'"
 	    else
 		cmd="$files $wrap $cmd --cluster $cluster --setuser ceph --setgroup ceph $runmode"
 	    fi