gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clear-config.sh now works with a secondary disk (#5135)

Browse Source
This commit is contained in:
Michael Vines
2019-07-16 19:09:14 -07:00
committed by GitHub
parent 94db9cd412
commit 349e5001d6
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multinode-demo/clear-config.sh
View File

@ -11,7 +11,9 @@ set -e
for i in "$SOLANA_RSYNC_CONFIG_DIR" "$SOLANA_CONFIG_DIR"; do for i in "$SOLANA_RSYNC_CONFIG_DIR" "$SOLANA_CONFIG_DIR"; do
echo "Cleaning $i" echo "Cleaning $i"
rm -rvf "${i:?}/" # <-- $i might be a symlink, rm the other side of it first
rm -rvf "$i" rm -rvf "$i"
mkdir -p "$i" mkdir -p "$i"
done done
setup_secondary_mount

15
multinode-demo/common.sh
View File

@ -72,13 +72,16 @@ SOLANA_RSYNC_CONFIG_DIR=$SOLANA_ROOT/config
# Configuration that remains local # Configuration that remains local
SOLANA_CONFIG_DIR=$SOLANA_ROOT/config-local SOLANA_CONFIG_DIR=$SOLANA_ROOT/config-local
# If there is a secondary disk, symlink the config-local dir there
SECONDARY_DISK_MOUNT_POINT=/mnt/extra-disk SECONDARY_DISK_MOUNT_POINT=/mnt/extra-disk
if [[ -d $SECONDARY_DISK_MOUNT_POINT ]]; then setup_secondary_mount() {
mkdir -p $SECONDARY_DISK_MOUNT_POINT/config-local # If there is a secondary disk, symlink the config-local dir there
mkdir -p "$SOLANA_ROOT" if [[ -d $SECONDARY_DISK_MOUNT_POINT ]]; then
ln -s $SECONDARY_DISK_MOUNT_POINT/config-local "$SOLANA_ROOT" mkdir -p $SECONDARY_DISK_MOUNT_POINT/config-local
fi rm -rf "$SOLANA_CONFIG_DIR"
ln -sfT $SECONDARY_DISK_MOUNT_POINT/config-local "$SOLANA_CONFIG_DIR"
fi
}
setup_secondary_mount
default_arg() { default_arg() {
declare name=$1 declare name=$1