From 53e81aab442855b34ee6e922f181bae3bf33e292 Mon Sep 17 00:00:00 2001
From: wangchaunhong <root@A22832429.(none)>
Date: Tue, 20 Oct 2015 18:40:23 +0800
Subject: [PATCH] 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
---
 src/init-ceph.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 2ff98c7c21af..d558463ba0a1 100644
--- 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
-- 
2.47.3