blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename leader/validator to bootstrap-leader/fullnode 

Only rsyncing the genesis ledger snuck in here as well
This commit is contained in:
Michael Vines 2018-12-06 13:38:45 -08:00
parent b34e197424
commit 70c149c7da
15 changed files with 135 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -6,13 +6,10 @@
**/*.rs.bk **/*.rs.bk
.cargo .cargo
# node configuration files # node config that is rsynced
/config/ /config/
/config-private/ # node config that remains local
/config-drone/ /config-local/
/config-validator/
/config-client/
/multinode-demo/test/config-client/
# log files # log files
*.log *.log

35
book/src/getting-started.md
View File

@ -41,7 +41,7 @@ $ git checkout $TAG
### Configuration Setup ### Configuration Setup
The network is initialized with a genesis ledger and leader/validator configuration files. The network is initialized with a genesis ledger and fullnode configuration files.
These files can be generated by running the following script. These files can be generated by running the following script.
```bash ```bash
@ -50,12 +50,12 @@ $ ./multinode-demo/setup.sh
### Drone ### Drone
In order for the leader, client and validators to work, we'll need to In order for the fullnodes and clients to work, we'll need to
spin up a drone to give out some test tokens. The drone delivers Milton spin up a drone to give out some test tokens. The drone delivers Milton
Friedman-style "air drops" (free tokens to requesting clients) to be used in Friedman-style "air drops" (free tokens to requesting clients) to be used in
test transactions. test transactions.
Start the drone on the leader node with: Start the drone with:
```bash ```bash
$ ./multinode-demo/drone.sh $ ./multinode-demo/drone.sh
@ -64,13 +64,13 @@ $ ./multinode-demo/drone.sh
### Singlenode Testnet ### Singlenode Testnet
Before you start a fullnode, make sure you know the IP address of the machine you Before you start a fullnode, make sure you know the IP address of the machine you
want to be the leader for the demo, and make sure that udp ports 8000-10000 are want to be the bootstrap leader for the demo, and make sure that udp ports 8000-10000 are
open on all the machines you want to test with. open on all the machines you want to test with.
Now start the server in a separate shell: Now start the bootstrap leader in a separate shell:
```bash ```bash
$ ./multinode-demo/leader.sh $ ./multinode-demo/bootstrap-leader.sh
``` ```
Wait a few seconds for the server to initialize. It will print "leader ready..." when it's ready to Wait a few seconds for the server to initialize. It will print "leader ready..." when it's ready to
@ -79,21 +79,21 @@ The drone does not need to be running for subsequent leader starts.
### Multinode Testnet ### Multinode Testnet
To run a multinode testnet, after starting a leader node, spin up some validator nodes in To run a multinode testnet, after starting a leader node, spin up some
separate shells: additional full nodes in separate shells:
```bash ```bash
$ ./multinode-demo/validator.sh $ ./multinode-demo/fullnode-x.sh
``` ```
To run a performance-enhanced leader or validator (on Linux), To run a performance-enhanced full node on Linux,
[CUDA 10.0](https://developer.nvidia.com/cuda-downloads) must be installed on [CUDA 10.0](https://developer.nvidia.com/cuda-downloads) must be installed on
your system: your system:
```bash ```bash
$ ./fetch-perf-libs.sh $ ./fetch-perf-libs.sh
$ SOLANA_CUDA=1 ./multinode-demo/leader.sh $ SOLANA_CUDA=1 ./multinode-demo/bootstrap-leader.sh
$ SOLANA_CUDA=1 ./multinode-demo/validator.sh $ SOLANA_CUDA=1 ./multinode-demo/fullnode-x.sh
``` ```
@ -153,14 +153,13 @@ $ sudo snap refresh solana --devmode
``` ```
### Daemon Support ### Daemon Support
The snap supports running a leader, validator or leader+drone node as a system The snap supports running fullnodes and a drone as system daemons.
daemon.
Run `sudo snap get solana` to view the current daemon configuration. To view Run `sudo snap get solana` to view the current daemon configuration. To view
daemon logs: daemon logs:
1. Run `sudo snap logs -n=all solana` to view the daemon initialization log 1. Run `sudo snap logs -n=all solana` to view the daemon initialization log
2. Runtime logging can be found under `/var/snap/solana/current/leader/`, 2. Runtime logging can be found under `/var/snap/solana/current/bootstrap-leader/`,
`/var/snap/solana/current/validator/`, or `/var/snap/solana/current/drone/` depending `/var/snap/solana/current/fullnode/`, or `/var/snap/solana/current/drone/` depending
on which `mode=` was selected. Within each log directory the file `current` on which `mode=` was selected. Within each log directory the file `current`
contains the latest log, and the files `*.s` (if present) contain older rotated contains the latest log, and the files `*.s` (if present) contain older rotated
logs. logs.
@ -177,7 +176,7 @@ Runtime configuration files for the daemon can be found in
#### Leader Daemon #### Leader Daemon
```bash ```bash
$ sudo snap set solana mode=bootstrap-fullnode $ sudo snap set solana mode=bootstrap-leader
``` ```
`rsync` must be configured and running on the leader. `rsync` must be configured and running on the leader.
@ -200,7 +199,7 @@ to port tcp:873, tcp:9900 and the port range udp:8000-udp:10000**
To run both the Leader and Drone: To run both the Leader and Drone:
```bash ```bash
$ sudo snap set solana mode=bootstrap-fullnode+drone $ sudo snap set solana mode=bootstrap-leader+drone
``` ```

4
ci/localnet-sanity.sh
View File

@ -11,7 +11,7 @@ source scripts/configure-metrics.sh
multinode-demo/setup.sh multinode-demo/setup.sh
backgroundCommands="drone leader validator validator-x" backgroundCommands="drone bootstrap-leader fullnode fullnode-x"
pids=() pids=()
for cmd in $backgroundCommands; do for cmd in $backgroundCommands; do
@ -88,7 +88,7 @@ echo "--- Ledger verification"
( (
source multinode-demo/common.sh source multinode-demo/common.sh
set -x set -x
cp -R "$SOLANA_CONFIG_DIR"/ledger /tmp/ledger-$$ cp -R "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger /tmp/ledger-$$
$solana_ledger_tool --ledger /tmp/ledger-$$ verify || exit $? $solana_ledger_tool --ledger /tmp/ledger-$$ verify || exit $?
rm -rf /tmp/ledger-$$ rm -rf /tmp/ledger-$$
) || flag_error ) || flag_error

1
multinode-demo/bootstrap-leader.sh Symbolic link
View File

@ -0,0 +1 @@
leader.sh

18
multinode-demo/common.sh
View File

@ -8,8 +8,8 @@
# #
rsync=rsync rsync=rsync
leader_logger="tee leader.log" bootstrap_leader_logger="tee bootstrap-leader.log"
validator_logger="tee validator.log" fullnode_logger="tee fullnode.log"
drone_logger="tee drone.log" drone_logger="tee drone.log"
if [[ $(uname) != Linux ]]; then if [[ $(uname) != Linux ]]; then
@ -32,12 +32,12 @@ if [[ -d $SNAP ]]; then # Running inside a Linux Snap?
} }
rsync="$SNAP"/bin/rsync rsync="$SNAP"/bin/rsync
multilog="$SNAP/bin/multilog t s16777215 n200" multilog="$SNAP/bin/multilog t s16777215 n200"
leader_logger="$multilog $SNAP_DATA/leader" bootstrap_leader_logger="$multilog $SNAP_DATA/bootstrap-leader"
validator_logger="$multilog t $SNAP_DATA/validator" fullnode_logger="$multilog t $SNAP_DATA/fullnode"
drone_logger="$multilog $SNAP_DATA/drone" drone_logger="$multilog $SNAP_DATA/drone"
# Create log directories manually to prevent multilog from creating them as # Create log directories manually to prevent multilog from creating them as
# 0700 # 0700
mkdir -p "$SNAP_DATA"/{drone,leader,validator} mkdir -p "$SNAP_DATA"/{drone,bootstrap-leader,fullnode}
elif [[ -n $USE_SNAP ]]; then # Use the Linux Snap binaries elif [[ -n $USE_SNAP ]]; then # Use the Linux Snap binaries
solana_program() { solana_program() {
@ -130,7 +130,9 @@ tune_networking() {
fi fi
} }
SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config # The directory on the bootstrap leader that is rsynced by other full nodes as
SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private # they boot (TODO: Eventually this should go away)
SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-$PWD}/config-validator SOLANA_RSYNC_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
# Configuration that remains local
SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config-local

8
multinode-demo/drone.sh
View File

@ -19,10 +19,10 @@ usage() {
exit 1 exit 1
} }
[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json ]] || { [[ -f "$SOLANA_CONFIG_DIR"/mint-id.json ]] || {
echo "$SOLANA_CONFIG_PRIVATE_DIR/mint-id.json not found, create it by running:" echo "$SOLANA_CONFIG_DIR/mint-id.json not found, create it by running:"
echo echo
echo " ${here}/setup.sh -t leader" echo " ${here}/setup.sh"
exit 1 exit 1
} }
@ -30,7 +30,7 @@ set -ex
trap 'kill "$pid" && wait "$pid"' INT TERM trap 'kill "$pid" && wait "$pid"' INT TERM
$solana_drone \ $solana_drone \
--keypair "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json \ --keypair "$SOLANA_CONFIG_DIR"/mint-id.json \
> >($drone_logger) 2>&1 & > >($drone_logger) 2>&1 &
pid=$! pid=$!
wait "$pid" wait "$pid"

1
multinode-demo/fullnode-x.sh Symbolic link
View File

@ -0,0 +1 @@
validator-x.sh

1
multinode-demo/fullnode.sh Symbolic link
View File

@ -0,0 +1 @@
validator.sh

12
multinode-demo/leader.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Starts a leader node # Start the bootstrap leader node
# #
here=$(dirname "$0") here=$(dirname "$0")
@ -16,8 +16,8 @@ if [[ -d "$SNAP" ]]; then
[[ -n "$(snapctl get mode)" ]] || exit 0 [[ -n "$(snapctl get mode)" ]] || exit 0
fi fi
[[ -f "$SOLANA_CONFIG_DIR"/leader.json ]] || { [[ -f "$SOLANA_CONFIG_DIR"/bootstrap-leader.json ]] || {
echo "$SOLANA_CONFIG_DIR/leader.json not found, create it by running:" echo "$SOLANA_CONFIG_DIR/bootstrap-leader.json not found, create it by running:"
echo echo
echo " ${here}/setup.sh" echo " ${here}/setup.sh"
exit 1 exit 1
@ -34,10 +34,10 @@ tune_networking
trap 'kill "$pid" && wait "$pid"' INT TERM trap 'kill "$pid" && wait "$pid"' INT TERM
$program \ $program \
--no-leader-rotation \ --no-leader-rotation \
--identity "$SOLANA_CONFIG_DIR"/leader.json \ --identity "$SOLANA_CONFIG_DIR"/bootstrap-leader.json \
--ledger "$SOLANA_CONFIG_DIR"/ledger \ --ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger \
--rpc 8899 \ --rpc 8899 \
> >($leader_logger) 2>&1 & > >($bootstrap_leader_logger) 2>&1 &
pid=$! pid=$!
oom_score_adj "$pid" 1000 oom_score_adj "$pid" 1000
wait "$pid" wait "$pid"

82
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 validator or leader. Creates configuration files options are bootstrap_leader or fullnode. Creates configuration files
for both by default for both by default
EOF EOF
@ -32,8 +32,8 @@ EOF
ip_address_arg=-l ip_address_arg=-l
num_tokens=1000000000 num_tokens=1000000000
node_type_leader=true bootstrap_leader=true
node_type_validator=true fullnode=true
while getopts "h?n:lpt:" opt; do while getopts "h?n:lpt:" opt; do
case $opt in case $opt in
h|\?) h|\?)
@ -52,13 +52,13 @@ while getopts "h?n:lpt:" opt; do
t) t)
node_type="$OPTARG" node_type="$OPTARG"
case $OPTARG in case $OPTARG in
leader) bootstrap_leader|leader) # TODO: Remove legacy 'leader' option
node_type_leader=true bootstrap_leader=true
node_type_validator=false fullnode=false
;; ;;
validator) fullnode|validator) # TODO: Remove legacy 'validator' option
node_type_leader=false bootstrap_leader=false
node_type_validator=true fullnode=true
;; ;;
*) *)
usage "Error: unknown node type: $node_type" usage "Error: unknown node type: $node_type"
@ -74,49 +74,43 @@ done
set -e set -e
for i in "$SOLANA_CONFIG_DIR" "$SOLANA_CONFIG_VALIDATOR_DIR" "$SOLANA_CONFIG_PRIVATE_DIR"; do for i in "$SOLANA_RSYNC_CONFIG_DIR" "$SOLANA_CONFIG_DIR"; do
echo "Cleaning $i" echo "Cleaning $i"
rm -rvf "$i" rm -rvf "$i"
mkdir -p "$i" mkdir -p "$i"
done done
if $node_type_leader; then if $bootstrap_leader; then
leader_address_args=("$ip_address_arg") # Create genesis configuration
leader_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/leader-id.json (
mint_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json set -x
$solana_keygen -o "$SOLANA_CONFIG_DIR"/mint-id.json
$solana_keygen -o "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json
$solana_genesis \
--bootstrap-leader-keypair "$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json \
--ledger "$SOLANA_RSYNC_CONFIG_DIR"/ledger \
--mint "$SOLANA_CONFIG_DIR"/mint-id.json \
--num_tokens "$num_tokens"
)
$solana_keygen -o "$leader_id_path" # Create bootstrap leader configuration
(
set -x
$solana_fullnode_config \
--keypair="$SOLANA_CONFIG_DIR"/bootstrap-leader-id.json \
"$ip_address_arg" > "$SOLANA_CONFIG_DIR"/bootstrap-leader.json
echo "Creating $mint_id_path with $num_tokens tokens" cp -ra "$SOLANA_RSYNC_CONFIG_DIR"/ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger
$solana_keygen -o "$mint_id_path" )
echo "Creating $SOLANA_CONFIG_DIR/leader.json"
$solana_fullnode_config \
--keypair="$leader_id_path" \
"${leader_address_args[@]}" > "$SOLANA_CONFIG_DIR"/leader.json
echo "Creating $SOLANA_CONFIG_DIR/ledger"
$solana_genesis \
--num_tokens "$num_tokens" \
--mint "$mint_id_path" \
--bootstrap-leader-keypair "$leader_id_path" \
--ledger "$SOLANA_CONFIG_DIR"/ledger \
ls -lhR "$SOLANA_CONFIG_DIR"/
ls -lhR "$SOLANA_CONFIG_PRIVATE_DIR"/
fi fi
if $node_type_validator; then if $fullnode; then
validator_address_args=("$ip_address_arg" -b 9000) (
validator_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/validator-id.json set -x
$solana_keygen -o "$SOLANA_CONFIG_DIR"/fullnode-id.json
$solana_keygen -o "$validator_id_path" $solana_fullnode_config \
--keypair="$SOLANA_CONFIG_DIR"/fullnode-id.json \
echo "Creating $SOLANA_CONFIG_VALIDATOR_DIR/validator.json" "$ip_address_arg" -b 9000 > "$SOLANA_CONFIG_DIR"/fullnode.json
$solana_fullnode_config \ )
--keypair="$validator_id_path" \
"${validator_address_args[@]}" > "$SOLANA_CONFIG_VALIDATOR_DIR"/validator.json
ls -lhR "$SOLANA_CONFIG_VALIDATOR_DIR"/
fi fi

4
multinode-demo/validator-x.sh
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Start a dynamically-configured validator node # Start a dynamically-configured full node
# #
here=$(dirname "$0") here=$(dirname "$0")
exec "$here"/validator.sh -x "$@" exec "$here"/fullnode.sh -x "$@"

65
multinode-demo/validator.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Start a validator node # Start a full node
# #
here=$(dirname "$0") here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
@ -20,11 +20,11 @@ usage() {
echo "$*" echo "$*"
echo echo
fi fi
echo "usage: $0 [-x] [rsync network path to leader] [network entry point]" echo "usage: $0 [-x] [rsync network path to bootstrap leader configuration] [network entry point]"
echo echo
echo " Start a validator on the specified network" echo " Start a full node on the specified network"
echo echo
echo " -x: runs a new, dynamically-configured validator" echo " -x: runs a new, dynamically-configured full node"
echo echo
exit 1 exit 1
} }
@ -100,47 +100,36 @@ else
fi fi
if ((!self_setup)); then if ((!self_setup)); then
[[ -f $SOLANA_CONFIG_VALIDATOR_DIR/validator.json ]] || { [[ -f $SOLANA_CONFIG_DIR/fullnode.json ]] || {
echo "$SOLANA_CONFIG_VALIDATOR_DIR/validator.json not found, create it by running:" echo "$SOLANA_CONFIG_DIR/fullnode.json not found, create it by running:"
echo echo
echo " ${here}/setup.sh" echo " ${here}/setup.sh"
exit 1 exit 1
} }
validator_id_path=$SOLANA_CONFIG_PRIVATE_DIR/validator-id.json fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id.json
validator_json_path=$SOLANA_CONFIG_VALIDATOR_DIR/validator.json fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode.json
SOLANA_LEADER_CONFIG_DIR=$SOLANA_CONFIG_VALIDATOR_DIR/leader-config ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger
else else
mkdir -p "$SOLANA_CONFIG_PRIVATE_DIR" mkdir -p "$SOLANA_CONFIG_DIR"
validator_id_path=$SOLANA_CONFIG_PRIVATE_DIR/validator-id-x$$.json fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id-x$$.json
$solana_keygen -o "$validator_id_path" $solana_keygen -o "$fullnode_id_path"
mkdir -p "$SOLANA_CONFIG_VALIDATOR_DIR" mkdir -p "$SOLANA_CONFIG_DIR"
validator_json_path=$SOLANA_CONFIG_VALIDATOR_DIR/validator-x$$.json fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode-x$$.json
port=9000 port=9000
(((port += ($$ % 1000)) && (port == 9000) && port++)) (((port += ($$ % 1000)) && (port == 9000) && port++))
$solana_fullnode_config --keypair="$validator_id_path" -l -b "$port" > "$validator_json_path" $solana_fullnode_config --keypair="$fullnode_id_path" -l -b "$port" > "$fullnode_json_path"
SOLANA_LEADER_CONFIG_DIR=$SOLANA_CONFIG_VALIDATOR_DIR/leader-config-x$$ ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger-x$$
fi fi
[[ -r $validator_id_path ]] || { [[ -r $fullnode_id_path ]] || {
echo "$validator_id_path does not exist" echo "$fullnode_id_path does not exist"
exit 1 exit 1
} }
# A fullnode requires 2 tokens to function:
# - one token to create an instance of the vote_program with
# - one second token to keep the node identity public key valid.
(
set -x
$solana_wallet \
--keypair "$validator_id_path" \
--network "$leader_address" \
airdrop 2
)
rsync_url() { # adds the 'rsync://` prefix to URLs that need it rsync_url() { # adds the 'rsync://` prefix to URLs that need it
declare url="$1" declare url="$1"
@ -165,19 +154,27 @@ rsync_leader_url=$(rsync_url "$leader")
tune_networking tune_networking
set -ex set -ex
$rsync -vPr "$rsync_leader_url"/config/ "$SOLANA_LEADER_CONFIG_DIR" $rsync -vPr "$rsync_leader_url"/config/ "$ledger_config_dir"
[[ -d $SOLANA_LEADER_CONFIG_DIR/ledger ]] || { [[ -d $ledger_config_dir/ledger ]] || {
echo "Unable to retrieve ledger from $rsync_leader_url" echo "Unable to retrieve ledger from $rsync_leader_url"
exit 1 exit 1
} }
# A fullnode requires 2 tokens to function:
# - one token to create an instance of the vote_program with
# - one second token to keep the node identity public key valid.
$solana_wallet \
--keypair "$fullnode_id_path" \
--network "$leader_address" \
airdrop 2
trap 'kill "$pid" && wait "$pid"' INT TERM trap 'kill "$pid" && wait "$pid"' INT TERM
$program \ $program \
--no-leader-rotation \ --no-leader-rotation \
--identity "$validator_json_path" \ --identity "$fullnode_json_path" \
--network "$leader_address" \ --network "$leader_address" \
--ledger "$SOLANA_LEADER_CONFIG_DIR"/ledger \ --ledger "$ledger_config_dir"/ledger \
> >($validator_logger) 2>&1 & > >($fullnode_logger) 2>&1 &
pid=$! pid=$!
oom_score_adj "$pid" 1000 oom_score_adj "$pid" 1000
wait "$pid" wait "$pid"

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

@ -64,12 +64,12 @@ snap)
fi fi
if [[ $nodeType = bootstrap-fullnode ]]; then if [[ $nodeType = bootstrap-fullnode ]]; then
nodeConfig="mode=bootstrap-fullnode+drone $commonNodeConfig" nodeConfig="mode=bootstrap-leader+drone $commonNodeConfig"
ln -sf -T /var/snap/solana/current/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
else else
nodeConfig="mode=fullnode $commonNodeConfig" nodeConfig="mode=fullnode $commonNodeConfig"
ln -sf -T /var/snap/solana/current/validator/current fullnode.log ln -sf -T /var/snap/solana/current/fullnode/current fullnode.log
fi fi
logmarker="solana deploy $(date)/$RANDOM" logmarker="solana deploy $(date)/$RANDOM"
@ -103,10 +103,10 @@ local|tar)
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 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/leader.sh > leader.log 2>&1 & ./multinode-demo/bootstrap-leader.sh > bootstrap-leader.log 2>&1 &
ln -sTf leader.log fullnode.log ln -sTf bootstrap-leader.log fullnode.log
;; ;;
fullnode) fullnode)
net/scripts/rsync-retry.sh -vPrc "$entrypointIp":~/.cargo/bin/ ~/.cargo/bin/ net/scripts/rsync-retry.sh -vPrc "$entrypointIp":~/.cargo/bin/ ~/.cargo/bin/
@ -116,9 +116,8 @@ local|tar)
export SOLANA_CUDA=1 export SOLANA_CUDA=1
fi fi
./multinode-demo/setup.sh -t validator $setupArgs ./multinode-demo/setup.sh -t fullnode $setupArgs
./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp:8001" > validator.log 2>&1 & ./multinode-demo/fullnode.sh "$entrypointIp":~/solana "$entrypointIp:8001" > fullnode.log 2>&1 &
ln -sTf validator.log fullnode.log
;; ;;
*) *)
echo "Error: unknown node type: $nodeType" echo "Error: unknown node type: $nodeType"

16
snap/hooks/configure vendored
View File

@ -2,7 +2,7 @@
echo Stopping daemons echo Stopping daemons
snapctl stop --disable solana.daemon-drone snapctl stop --disable solana.daemon-drone
snapctl stop --disable solana.daemon-bootstrap-fullnode snapctl stop --disable solana.daemon-bootstrap-leader
snapctl stop --disable solana.daemon-fullnode snapctl stop --disable solana.daemon-fullnode
snapctl stop --disable solana.daemon-oom-monitor snapctl stop --disable solana.daemon-oom-monitor
snapctl stop --disable solana.daemon-net-stats snapctl stop --disable solana.daemon-net-stats
@ -18,17 +18,17 @@ num_tokens="${num_tokens:+-n $num_tokens}"
setup_args="$(snapctl get setup-args)" setup_args="$(snapctl get setup-args)"
case $mode in case $mode in
bootstrap-fullnode+drone) bootstrap-leader+drone)
"$SNAP"/multinode-demo/setup.sh -t leader $num_tokens -p $setup_args "$SNAP"/multinode-demo/setup.sh -t bootstrap_leader $num_tokens -p $setup_args
snapctl start --enable solana.daemon-drone snapctl start --enable solana.daemon-drone
snapctl start --enable solana.daemon-bootstrap-fullnode snapctl start --enable solana.daemon-bootstrap-leader
;; ;;
bootstrap-fullnode) bootstrap-leader)
"$SNAP"/multinode-demo/setup.sh -t leader $num_tokens -p $setup_args "$SNAP"/multinode-demo/setup.sh -t bootstrap_leader $num_tokens -p $setup_args
snapctl start --enable solana.daemon-bootstrap-fullnode snapctl start --enable solana.daemon-bootstrap-leader
;; ;;
fullnode) fullnode)
"$SNAP"/multinode-demo/setup.sh -t validator -p $setup_args "$SNAP"/multinode-demo/setup.sh -t fullnode -p $setup_args
snapctl start --enable solana.daemon-fullnode snapctl start --enable solana.daemon-fullnode
;; ;;
*) *)

6
snap/snapcraft.yaml
View File

@ -55,13 +55,13 @@ apps:
- home - home
daemon-fullnode: daemon-fullnode:
daemon: simple daemon: simple
command: scripts/snap-config-to-env.sh $SNAP/multinode-demo/validator.sh command: scripts/snap-config-to-env.sh $SNAP/multinode-demo/fullnode.sh
plugs: plugs:
- network - network
- network-bind - network-bind
daemon-bootstrap-fullnode: daemon-bootstrap-leader:
daemon: simple daemon: simple
command: scripts/snap-config-to-env.sh $SNAP/multinode-demo/leader.sh command: scripts/snap-config-to-env.sh $SNAP/multinode-demo/bootstrap-leader.sh
plugs: plugs:
- network - network
- network-bind - network-bind