From 6f27492e92131560892d784d930cf0c8333205ca Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 30 Mar 2011 13:14:55 -0700 Subject: [PATCH] mkcephfs: copy to daemon nodes for each daemon The tmp directory is removed after each daemon. Previously, this would break if two daemons were on the same node. Now, the files will be copied for each daemon. Signed-off-by: Samuel Just --- src/mkcephfs.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 35f1da6be01b6..41398fcafea2f 100644 --- a/src/mkcephfs.in +++ b/src/mkcephfs.in @@ -389,12 +389,11 @@ if [ $allhosts -eq 1 ]; then check_host || continue - if [ -n "$ssh" ] && ( echo $pushed_to | grep -v -q " $host " ); then + if [ -n "$ssh" ]; then echo pushing conf and monmap to $host do_cmd "mkdir -p $rdir" scp -q $dir/conf $host:$rdir scp -q $dir/monmap $host:$rdir - pushed_to="$pushed_to $host " fi if [ $mkbtrfs -eq 1 ] && [ "$type" = "osd" ]; then @@ -415,7 +414,6 @@ if [ $allhosts -eq 1 ]; then $0 -d $dir --prepare-mon $moreargs # mons - pushed_to="" get_name_list "mon" for name in $what; do @@ -426,11 +424,10 @@ if [ $allhosts -eq 1 ]; then check_host || continue - if [ -n "$ssh" ] && ( echo $pushed_to | grep -v -q " $host " ); then + if [ -n "$ssh" ]; then echo pushing everything to $host ssh $host mkdir -p $rdir scp -q $dir/* $host:$rdir - pushed_to="$pushed_to $host " fi do_cmd "$0 -d $rdir --init-daemon $name" -- 2.39.5