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

Fix validator keys path (#13772)

Browse Source
This commit is contained in:
sakridge
2020-11-26 19:20:56 -08:00
committed by GitHub
parent d18b417346
commit 008b56e535
3 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
net/net.sh
View File

@ -196,24 +196,29 @@ build() {
echo "Build took $SECONDS seconds"
}
SOLANA_HOME="\$HOME/solana"
CARGO_BIN="\$HOME/.cargo/bin"
startCommon() {
declare ipAddress=$1
test -d "$SOLANA_ROOT"
if $skipSetup; then
# shellcheck disable=SC2029
ssh "${sshOptions[@]}" "$ipAddress" "
set -x;
mkdir -p ~/solana/config;
mkdir -p $SOLANA_HOME/config;
rm -rf ~/config;
mv ~/solana/config ~;
rm -rf ~/solana;
mkdir -p ~/solana ~/.cargo/bin;
mv ~/config ~/solana/
mv $SOLANA_HOME/config ~;
rm -rf $SOLANA_HOME;
mkdir -p $SOLANA_HOME $CARGO_BIN;
mv ~/config $SOLANA_HOME/
"
else
# shellcheck disable=SC2029
ssh "${sshOptions[@]}" "$ipAddress" "
set -x;
rm -rf ~/solana;
mkdir -p ~/.cargo/bin
rm -rf $SOLANA_HOME;
mkdir -p $CARGO_BIN
"
fi
[[ -z "$externalNodeSshKey" ]] || ssh-copy-id -f -i "$externalNodeSshKey" "${sshOptions[@]}" "solana@$ipAddress"
@ -226,7 +231,7 @@ syncScripts() {
rsync -vPrc -e "ssh ${sshOptions[*]}" \
--exclude 'net/log*' \
"$SOLANA_ROOT"/{fetch-perf-libs.sh,fetch-spl.sh,scripts,net,multinode-demo} \
"$ipAddress":~/solana/ > /dev/null
"$ipAddress":"$SOLANA_HOME"/ > /dev/null
}
# Deploy local binaries to bootstrap validator. Other validators and clients later fetch the
@ -237,11 +242,11 @@ deployBootstrapValidator() {
echo "Deploying software to bootstrap validator ($ipAddress)"
case $deployMethod in
tar)
rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/bin/* "$ipAddress:~/.cargo/bin/"
rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/bin/* "$ipAddress:$CARGO_BIN/"
rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/solana-release/version.yml "$ipAddress:~/"
;;
local)
rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/bin/* "$ipAddress:~/.cargo/bin/"
rsync -vPrc -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/bin/* "$ipAddress:$CARGO_BIN/"
ssh "${sshOptions[@]}" -n "$ipAddress" "rm -f ~/version.yml; touch ~/version.yml"
;;
skip)
@ -1096,7 +1101,7 @@ netem)
remoteNetemConfigFile="$(basename "$netemConfigFile")"
if [[ $netemCommand = "add" ]]; then
for ipAddress in "${validatorIpList[@]}"; do
"$here"/scp.sh "$netemConfigFile" solana@"$ipAddress":~/solana
"$here"/scp.sh "$netemConfigFile" solana@"$ipAddress":"$SOLANA_HOME"
done
fi
for i in "${!validatorIpList[@]}"; do