Rename leader/validator to bootstrap-leader/fullnode

Only rsyncing the genesis ledger snuck in here as well
2018-12-06 13:38:45 -08:00
parent b34e197424
commit 70c149c7da
15 changed files with 135 additions and 144 deletions
--- a/multinode-demo/bootstrap-leader.sh
+++ b/multinode-demo/bootstrap-leader.sh
@@ -0,0 +1 @@
+leader.sh
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -8,8 +8,8 @@
 #

 rsync=rsync
-leader_logger="tee leader.log"
-validator_logger="tee validator.log"
+bootstrap_leader_logger="tee bootstrap-leader.log"
+fullnode_logger="tee fullnode.log"
 drone_logger="tee drone.log"

 if [[ $(uname) != Linux ]]; then
@@ -32,12 +32,12 @@ if [[ -d $SNAP ]]; then # Running inside a Linux Snap?
  }
  rsync="$SNAP"/bin/rsync
  multilog="$SNAP/bin/multilog t s16777215 n200"
-  leader_logger="$multilog $SNAP_DATA/leader"
-  validator_logger="$multilog t $SNAP_DATA/validator"
+  bootstrap_leader_logger="$multilog $SNAP_DATA/bootstrap-leader"
+  fullnode_logger="$multilog t $SNAP_DATA/fullnode"
  drone_logger="$multilog $SNAP_DATA/drone"
  # Create log directories manually to prevent multilog from creating them as
  # 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
  solana_program() {
@@ -130,7 +130,9 @@ tune_networking() {
  fi
 }

-SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
-SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private
-SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-$PWD}/config-validator
+# The directory on the bootstrap leader that is rsynced by other full nodes as
+# they boot (TODO: Eventually this should go away)
+SOLANA_RSYNC_CONFIG_DIR=${SNAP_DATA:-$PWD}/config

+# Configuration that remains local
+SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config-local
--- a/multinode-demo/drone.sh
+++ b/multinode-demo/drone.sh
@@ -19,10 +19,10 @@ usage() {
  exit 1
 }

-[[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json ]] || {
-  echo "$SOLANA_CONFIG_PRIVATE_DIR/mint-id.json not found, create it by running:"
+[[ -f "$SOLANA_CONFIG_DIR"/mint-id.json ]] || {
+  echo "$SOLANA_CONFIG_DIR/mint-id.json not found, create it by running:"
  echo
-  echo "  ${here}/setup.sh -t leader"
+  echo "  ${here}/setup.sh"
  exit 1
 }

@@ -30,7 +30,7 @@ set -ex

 trap 'kill "$pid" && wait "$pid"' INT TERM
 $solana_drone \
-  --keypair "$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json \
+  --keypair "$SOLANA_CONFIG_DIR"/mint-id.json \
  > >($drone_logger) 2>&1 &
 pid=$!
 wait "$pid"
--- a/multinode-demo/fullnode-x.sh
+++ b/multinode-demo/fullnode-x.sh
@@ -0,0 +1 @@
+validator-x.sh
--- a/multinode-demo/fullnode.sh
+++ b/multinode-demo/fullnode.sh
@@ -0,0 +1 @@
+validator.sh
--- a/multinode-demo/leader.sh
+++ b/multinode-demo/leader.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Starts a leader node
+# Start the bootstrap leader node
 #

 here=$(dirname "$0")
@@ -16,8 +16,8 @@ if [[ -d "$SNAP" ]]; then
  [[ -n "$(snapctl get mode)" ]] || exit 0
 fi

-[[ -f "$SOLANA_CONFIG_DIR"/leader.json ]] || {
-  echo "$SOLANA_CONFIG_DIR/leader.json not found, create it by running:"
+[[ -f "$SOLANA_CONFIG_DIR"/bootstrap-leader.json ]] || {
+  echo "$SOLANA_CONFIG_DIR/bootstrap-leader.json not found, create it by running:"
  echo
  echo "  ${here}/setup.sh"
  exit 1
@@ -34,10 +34,10 @@ tune_networking
 trap 'kill "$pid" && wait "$pid"' INT TERM
 $program \
  --no-leader-rotation \
-  --identity "$SOLANA_CONFIG_DIR"/leader.json \
-  --ledger "$SOLANA_CONFIG_DIR"/ledger \
+  --identity "$SOLANA_CONFIG_DIR"/bootstrap-leader.json \
+  --ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger \
  --rpc 8899 \
-  > >($leader_logger) 2>&1 &
+  > >($bootstrap_leader_logger) 2>&1 &
 pid=$!
 oom_score_adj "$pid" 1000
 wait "$pid"
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -23,7 +23,7 @@ Creates a fullnode configuration
                  may be a private IP address unaccessible on the Intenet (default)
 -p             - Detect public address using public Internet servers
 -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

 EOF
@@ -32,8 +32,8 @@ EOF

 ip_address_arg=-l
 num_tokens=1000000000
-node_type_leader=true
-node_type_validator=true
+bootstrap_leader=true
+fullnode=true
 while getopts "h?n:lpt:" opt; do
  case $opt in
  h|\?)
@@ -52,13 +52,13 @@ while getopts "h?n:lpt:" opt; do
  t)
    node_type="$OPTARG"
    case $OPTARG in
-    leader)
-      node_type_leader=true
-      node_type_validator=false
+    bootstrap_leader|leader) # TODO: Remove legacy 'leader' option
+      bootstrap_leader=true
+      fullnode=false
      ;;
-    validator)
-      node_type_leader=false
-      node_type_validator=true
+    fullnode|validator) # TODO: Remove legacy 'validator' option
+      bootstrap_leader=false
+      fullnode=true
      ;;
    *)
      usage "Error: unknown node type: $node_type"
@@ -74,49 +74,43 @@ done

 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"
  rm -rvf "$i"
  mkdir -p "$i"
 done

-if $node_type_leader; then
-  leader_address_args=("$ip_address_arg")
-  leader_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/leader-id.json
-  mint_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/mint-id.json
+if $bootstrap_leader; then
+  # Create genesis configuration
+  (
+    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"
-  $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"/
+    cp -ra "$SOLANA_RSYNC_CONFIG_DIR"/ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader-ledger
+  )
 fi


-if $node_type_validator; then
-  validator_address_args=("$ip_address_arg" -b 9000)
-  validator_id_path="$SOLANA_CONFIG_PRIVATE_DIR"/validator-id.json
-
-  $solana_keygen -o "$validator_id_path"
-
-  echo "Creating $SOLANA_CONFIG_VALIDATOR_DIR/validator.json"
-  $solana_fullnode_config \
-    --keypair="$validator_id_path"  \
-    "${validator_address_args[@]}" > "$SOLANA_CONFIG_VALIDATOR_DIR"/validator.json
-
-  ls -lhR "$SOLANA_CONFIG_VALIDATOR_DIR"/
+if $fullnode; then
+  (
+    set -x
+    $solana_keygen -o "$SOLANA_CONFIG_DIR"/fullnode-id.json
+    $solana_fullnode_config \
+      --keypair="$SOLANA_CONFIG_DIR"/fullnode-id.json \
+      "$ip_address_arg" -b 9000 > "$SOLANA_CONFIG_DIR"/fullnode.json
+  )
 fi
--- a/multinode-demo/validator-x.sh
+++ b/multinode-demo/validator-x.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #
-# Start a dynamically-configured validator node
+# Start a dynamically-configured full node
 #

 here=$(dirname "$0")

-exec "$here"/validator.sh -x "$@"
+exec "$here"/fullnode.sh -x "$@"
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Start a validator node
+# Start a full node
 #
 here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
@@ -20,11 +20,11 @@ usage() {
    echo "$*"
    echo
  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 " Start a validator on the specified network"
+  echo " Start a full node on the specified network"
  echo
-  echo "   -x: runs a new, dynamically-configured validator"
+  echo "   -x: runs a new, dynamically-configured full node"
  echo
  exit 1
 }
@@ -100,47 +100,36 @@ else
 fi

 if ((!self_setup)); then
-  [[ -f $SOLANA_CONFIG_VALIDATOR_DIR/validator.json ]] || {
-    echo "$SOLANA_CONFIG_VALIDATOR_DIR/validator.json not found, create it by running:"
+  [[ -f $SOLANA_CONFIG_DIR/fullnode.json ]] || {
+    echo "$SOLANA_CONFIG_DIR/fullnode.json not found, create it by running:"
    echo
    echo "  ${here}/setup.sh"
    exit 1
  }
-  validator_id_path=$SOLANA_CONFIG_PRIVATE_DIR/validator-id.json
-  validator_json_path=$SOLANA_CONFIG_VALIDATOR_DIR/validator.json
-  SOLANA_LEADER_CONFIG_DIR=$SOLANA_CONFIG_VALIDATOR_DIR/leader-config
+  fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id.json
+  fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode.json
+  ledger_config_dir=$SOLANA_CONFIG_DIR/fullnode-ledger
 else
-  mkdir -p "$SOLANA_CONFIG_PRIVATE_DIR"
-  validator_id_path=$SOLANA_CONFIG_PRIVATE_DIR/validator-id-x$$.json
-  $solana_keygen -o "$validator_id_path"
+  mkdir -p "$SOLANA_CONFIG_DIR"
+  fullnode_id_path=$SOLANA_CONFIG_DIR/fullnode-id-x$$.json
+  $solana_keygen -o "$fullnode_id_path"

-  mkdir -p "$SOLANA_CONFIG_VALIDATOR_DIR"
-  validator_json_path=$SOLANA_CONFIG_VALIDATOR_DIR/validator-x$$.json
+  mkdir -p "$SOLANA_CONFIG_DIR"
+  fullnode_json_path=$SOLANA_CONFIG_DIR/fullnode-x$$.json

  port=9000
  (((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

-[[ -r $validator_id_path ]] || {
-  echo "$validator_id_path does not exist"
+[[ -r $fullnode_id_path ]] || {
+  echo "$fullnode_id_path does not exist"
  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
  declare url="$1"

@@ -165,19 +154,27 @@ rsync_leader_url=$(rsync_url "$leader")
 tune_networking

 set -ex
-$rsync -vPr "$rsync_leader_url"/config/ "$SOLANA_LEADER_CONFIG_DIR"
-[[ -d $SOLANA_LEADER_CONFIG_DIR/ledger ]] || {
+$rsync -vPr "$rsync_leader_url"/config/ "$ledger_config_dir"
+[[ -d $ledger_config_dir/ledger ]] || {
  echo "Unable to retrieve ledger from $rsync_leader_url"
  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
 $program \
  --no-leader-rotation \
-  --identity "$validator_json_path" \
+  --identity "$fullnode_json_path" \
  --network "$leader_address" \
-  --ledger "$SOLANA_LEADER_CONFIG_DIR"/ledger \
-  > >($validator_logger) 2>&1 &
+  --ledger "$ledger_config_dir"/ledger \
+  > >($fullnode_logger) 2>&1 &
 pid=$!
 oom_score_adj "$pid" 1000
 wait "$pid"