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

Fully switch to bootstrap-leader for command-line args

Browse Source
This commit is contained in:
Michael Vines
2018-12-07 15:59:25 -08:00
parent 38901002b0
commit 872a3317b5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
multinode-demo/setup.sh
View File

@ -23,7 +23,7 @@ Creates a fullnode configuration
may be a private IP address unaccessible on the Intenet (default) may be a private IP address unaccessible on the Intenet (default)
-p - Detect public address using public Internet servers -p - Detect public address using public Internet servers
-t node_type - Create configuration files only for this kind of node. Valid -t node_type - Create configuration files only for this kind of node. Valid
options are bootstrap_leader or fullnode. Creates configuration files options are bootstrap-leader or fullnode. Creates configuration files
for both by default for both by default
EOF EOF
@ -52,7 +52,7 @@ while getopts "h?n:lpt:" opt; do
t) t)
node_type="$OPTARG" node_type="$OPTARG"
case $OPTARG in case $OPTARG in
bootstrap_leader|leader) # TODO: Remove legacy 'leader' option bootstrap-leader|leader) # TODO: Remove legacy 'leader' option
bootstrap_leader=true bootstrap_leader=true
fullnode=false fullnode=false
;; ;;

2
net/net.sh
View File

@ -183,7 +183,7 @@ startBootstrapNode() {
esac esac
ssh "${sshOptions[@]}" -n "$ipAddress" \ ssh "${sshOptions[@]}" -n "$ipAddress" \
"./solana/net/remote/remote-node.sh $deployMethod bootstrap_fullnode $publicNetwork $entrypointIp $expectedNodeCount \"$RUST_LOG\"" "./solana/net/remote/remote-node.sh $deployMethod bootstrap-leader $publicNetwork $entrypointIp $expectedNodeCount \"$RUST_LOG\""
) >> "$logFile" 2>&1 || { ) >> "$logFile" 2>&1 || {
cat "$logFile" cat "$logFile"
echo "^^^ +++" echo "^^^ +++"

8
net/remote/remote-node.sh
View File

@ -42,7 +42,7 @@ fi
case $deployMethod in case $deployMethod in
snap) snap)
SECONDS=0 SECONDS=0
[[ $nodeType = bootstrap_fullnode ]] || [[ $nodeType = bootstrap-leader ]] ||
net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/solana/solana.snap" . net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/solana/solana.snap" .
sudo snap install solana.snap --devmode --dangerous sudo snap install solana.snap --devmode --dangerous
@ -63,7 +63,7 @@ snap)
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
fi fi
if [[ $nodeType = bootstrap-fullnode ]]; then if [[ $nodeType = bootstrap-leader ]]; then
nodeConfig="mode=bootstrap-leader+drone $commonNodeConfig" nodeConfig="mode=bootstrap-leader+drone $commonNodeConfig"
ln -sf -T /var/snap/solana/current/bootstrap-leader/current fullnode.log ln -sf -T /var/snap/solana/current/bootstrap-leader/current fullnode.log
ln -sf -T /var/snap/solana/current/drone/current drone.log ln -sf -T /var/snap/solana/current/drone/current drone.log
@ -104,12 +104,12 @@ local|tar)
scripts/net-stats.sh > net-stats.log 2>&1 & scripts/net-stats.sh > net-stats.log 2>&1 &
case $nodeType in case $nodeType in
bootstrap_fullnode) bootstrap-leader)
if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then
echo Selecting solana-fullnode-cuda echo Selecting solana-fullnode-cuda
export SOLANA_CUDA=1 export SOLANA_CUDA=1
fi fi
./multinode-demo/setup.sh -t bootstrap_leader $setupArgs ./multinode-demo/setup.sh -t bootstrap-leader $setupArgs
./multinode-demo/drone.sh > drone.log 2>&1 & ./multinode-demo/drone.sh > drone.log 2>&1 &
./multinode-demo/bootstrap-leader.sh > bootstrap-leader.log 2>&1 & ./multinode-demo/bootstrap-leader.sh > bootstrap-leader.log 2>&1 &
ln -sTf bootstrap-leader.log fullnode.log ln -sTf bootstrap-leader.log fullnode.log