Set rsync url for local deployments
This commit is contained in:
parent
8c51b47e85
commit
e2e569cb43
|
@ -166,6 +166,9 @@ find_leader() {
|
||||||
declare shift=0
|
declare shift=0
|
||||||
|
|
||||||
if [[ -d $SNAP ]]; then
|
if [[ -d $SNAP ]]; then
|
||||||
|
if [[ -n $1 ]]; then
|
||||||
|
usage "Error: unexpected parameter: $1"
|
||||||
|
fi
|
||||||
|
|
||||||
# Select leader from the Snap configuration
|
# Select leader from the Snap configuration
|
||||||
leader_ip=$(snapctl get leader-ip)
|
leader_ip=$(snapctl get leader-ip)
|
||||||
|
|
|
@ -45,7 +45,7 @@ local)
|
||||||
export RUST_LOG
|
export RUST_LOG
|
||||||
|
|
||||||
rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
|
rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
|
||||||
solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana"
|
solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana $entrypointIp:8001"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown deployment method: $deployMethod"
|
echo "Unknown deployment method: $deployMethod"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -ex
|
||||||
|
|
||||||
cd "$(dirname "$0")"/../..
|
cd "$(dirname "$0")"/../..
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ local)
|
||||||
rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
|
rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
|
||||||
|
|
||||||
./multinode-demo/setup.sh -t validator $setupArgs
|
./multinode-demo/setup.sh -t validator $setupArgs
|
||||||
./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp" >validator.log 2>&1 &
|
./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp:8001" >validator.log 2>&1 &
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: unknown node type: $nodeType"
|
echo "Error: unknown node type: $nodeType"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -ex
|
||||||
#
|
#
|
||||||
# This script is to be run on the leader node
|
# This script is to be run on the leader node
|
||||||
#
|
#
|
||||||
|
@ -59,12 +59,16 @@ snap)
|
||||||
solana_bench_tps=solana.bench-tps
|
solana_bench_tps=solana.bench-tps
|
||||||
solana_ledger_tool=solana.ledger-tool
|
solana_ledger_tool=solana.ledger-tool
|
||||||
ledger=/var/snap/solana/current/config/ledger
|
ledger=/var/snap/solana/current/config/ledger
|
||||||
|
|
||||||
|
entrypointRsyncUrl="$entrypointIp"
|
||||||
;;
|
;;
|
||||||
local)
|
local)
|
||||||
PATH="$HOME"/.cargo/bin:"$PATH"
|
PATH="$HOME"/.cargo/bin:"$PATH"
|
||||||
export USE_INSTALL=1
|
export USE_INSTALL=1
|
||||||
|
|
||||||
solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana"
|
entrypointRsyncUrl="$entrypointIp:~/solana"
|
||||||
|
|
||||||
|
solana_bench_tps="multinode-demo/client.sh $entrypointRsyncUrl $entrypointIp:8001"
|
||||||
solana_ledger_tool=solana-ledger-tool
|
solana_ledger_tool=solana-ledger-tool
|
||||||
ledger=config/ledger
|
ledger=config/ledger
|
||||||
;;
|
;;
|
||||||
|
@ -77,7 +81,7 @@ esac
|
||||||
echo "--- $entrypointIp: wallet sanity"
|
echo "--- $entrypointIp: wallet sanity"
|
||||||
(
|
(
|
||||||
set -x
|
set -x
|
||||||
multinode-demo/test/wallet-sanity.sh "$entrypointIp"
|
multinode-demo/test/wallet-sanity.sh "$entrypointRsyncUrl"
|
||||||
)
|
)
|
||||||
|
|
||||||
echo "--- $entrypointIp: node count"
|
echo "--- $entrypointIp: node count"
|
||||||
|
@ -110,7 +114,7 @@ if $validatorSanity; then
|
||||||
(
|
(
|
||||||
set -ex -o pipefail
|
set -ex -o pipefail
|
||||||
./multinode-demo/setup.sh -t validator
|
./multinode-demo/setup.sh -t validator
|
||||||
timeout 10s ./multinode-demo/validator.sh "$entrypointIp" "$entrypointIp:8001" 2>&1 | tee validator.log
|
timeout 10s ./multinode-demo/validator.sh "$entrypointRsyncUrl" "$entrypointIp:8001" 2>&1 | tee validator.log
|
||||||
) || {
|
) || {
|
||||||
exitcode=$?
|
exitcode=$?
|
||||||
[[ $exitcode -eq 124 ]] || exit $exitcode
|
[[ $exitcode -eq 124 ]] || exit $exitcode
|
||||||
|
|
Loading…
Reference in New Issue