]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
init-ceph: fix systemd-run cant't start ceph daemon sometimes 6833/head
authorwangchaunhong <root@A22832429.(none)>
Tue, 20 Oct 2015 10:40:23 +0000 (18:40 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 7 Dec 2015 22:22:04 +0000 (23:22 +0100)
Fixes: #13474
Signed-off-by: Chuanhong Wang <wang.chuanhong@zte.com.cn>
(cherry picked from commit 2f36909e1e08bac993e77d1781a777b386335669)

src/init-ceph.in

index faeb7bd76d6ca03e356004386d2c87bc1a891d11..475769560a4c757502844d03a997970967c58946 100755 (executable)
@@ -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