diff options
| author | Samuel Just <samuel.just@dreamhost.com> | 2011-03-30 13:14:55 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-03-30 16:49:21 -0700 |
| commit | cf3bb44d47c88eebc6f5d42e2cd82cf685094442 (patch) | |
| tree | 65c5e498519608cd1cb3439021056a84190d99dd /src/mkcephfs.in | |
| parent | 5a1ccdcea84be473e5b13ea504e60dce82bdefaa (diff) | |
| download | ceph-cf3bb44d47c88eebc6f5d42e2cd82cf685094442.tar.gz | |
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 <samuel.just@dreamhost.com>
Diffstat (limited to 'src/mkcephfs.in')
| -rw-r--r-- | src/mkcephfs.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 89bf1fd9320..ebcbb349395 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" |