Move some common scripts from multinode-demo/ to scripts/

multinode-demo/common.sh

@@ -102,50 +102,8 @@ solana_ledger_tool=$(solana_program ledger-tool)
 export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 export RUST_BACKTRACE=1
 
-
-# The SOLANA_METRICS_CONFIG environment variable is formatted as a
-# comma-delimited list of parameters. All parameters are optional.
-#
-# Example:
-#   export SOLANA_METRICS_CONFIG="host=<metrics host>,db=<database name>,u=<username>,p=<password>"
-#
-configure_metrics() {
-  [[ -n $SOLANA_METRICS_CONFIG ]] || return 0
-
-  declare metrics_params
-  IFS=',' read -r -a metrics_params <<< "$SOLANA_METRICS_CONFIG"
-  for param in "${metrics_params[@]}"; do
-    IFS='=' read -r -a pair <<< "$param"
-    if [[ ${#pair[@]} != 2 ]]; then
-      echo Error: invalid metrics parameter: "$param" >&2
-    else
-      declare name="${pair[0]}"
-      declare value="${pair[1]}"
-      case "$name" in
-      host)
-        export INFLUX_HOST="$value"
-        echo INFLUX_HOST="$INFLUX_HOST" >&2
-        ;;
-      db)
-        export INFLUX_DATABASE="$value"
-        echo INFLUX_DATABASE="$INFLUX_DATABASE" >&2
-        ;;
-      u)
-        export INFLUX_USERNAME="$value"
-        echo INFLUX_USERNAME="$INFLUX_USERNAME" >&2
-        ;;
-      p)
-        export INFLUX_PASSWORD="$value"
-        echo INFLUX_PASSWORD="********" >&2
-        ;;
-      *)
-        echo Error: Unknown metrics parameter name: "$name" >&2
-        ;;
-      esac
-    fi
-  done
-}
-configure_metrics
+# shellcheck source=scripts/configure-metrics.sh
+source "$(dirname "${BASH_SOURCE[0]}")"/../scripts/configure-metrics.sh
 
 tune_networking() {
   # Skip in CI
@@ -177,20 +135,6 @@ tune_networking() {
   fi
 }
 
-oom_score_adj() {
-  declare pid=$1
-  declare score=$2
-  if [[ $(uname) != Linux ]]; then
-    return
-  fi
-
-  echo "$score" > "/proc/$pid/oom_score_adj" || true
-  declare currentScore
-  currentScore=$(cat "/proc/$pid/oom_score_adj" || true)
-  if [[ $score != "$currentScore" ]]; then
-    echo "Failed to set oom_score_adj to $score for pid $pid (current score: $currentScore)"
-  fi
-}
 
 SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
 SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private

multinode-demo/drone.sh

@@ -10,6 +10,9 @@ here=$(dirname "$0")
 source "$here"/common.sh
 SOLANA_CONFIG_DIR="$SOLANA_CONFIG_DIR"-drone
 
+# shellcheck source=scripts/oom-score-adj.sh
+source "$here"/../scripts/oom-score-adj.sh
+
 if [[ -d "$SNAP" ]]; then
   # Exit if mode is not yet configured
   # (typically the case after the Snap is first installed)

multinode-demo/leader.sh

@@ -7,6 +7,9 @@ here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
 source "$here"/common.sh
 
+# shellcheck source=scripts/oom-score-adj.sh
+source "$here"/../scripts/oom-score-adj.sh
+
 if [[ -d "$SNAP" ]]; then
   # Exit if mode is not yet configured
   # (typically the case after the Snap is first installed)

multinode-demo/metrics_write_datapoint.sh

@@ -1,19 +0,0 @@
-#!/bin/bash -e
-#
-# Send a metrics datapoint
-#
-
-point=$1
-if [[ -z $point ]]; then
-  echo "Data point not specified"
-  exit 1
-fi
-
-echo "Influx data point: $point"
-if [[ -z $INFLUX_DATABASE || -z $INFLUX_USERNAME || -z $INFLUX_PASSWORD ]]; then
-  echo Influx user credentials not found
-  exit 0
-fi
-
-echo "https://metrics.solana.com:8086/write?db=${INFLUX_DATABASE}&u=${INFLUX_USERNAME}&p=${INFLUX_PASSWORD}" \
-  | xargs curl --max-time 5 -XPOST --data-binary "$point"

multinode-demo/oom_monitor.sh

@@ -1,32 +0,0 @@
-#!/bin/bash -e
-#
-# Reports Linux OOM Killer activity
-#
-
-here=$(dirname "$0")
-# shellcheck source=multinode-demo/common.sh
-source "$here"/common.sh
-
-if [[ $(uname) != Linux ]]; then
-  exit 0
-fi
-
-syslog=/var/log/syslog
-if [[ ! -r $syslog ]]; then
-  echo Unable to read $syslog
-  exit 0
-fi
-
-# Adjust OOM score to reduce the chance that this script will be killed
-# during an Out of Memory event since the purpose of this script is to
-# report such events
-oom_score_adj "self" -500
-
-while read -r victim; do
-  echo "Out of memory event detected, $victim killed"
-  "$here"/metrics_write_datapoint.sh "oom-killer,victim=$victim killed=1"
-done < <( \
-  tail --follow=name --retry -n0 $syslog \
-  | sed --unbuffered -n 's/^.* Out of memory: Kill process [1-9][0-9]* (\([^)]*\)) .*/\1/p' \
-)
-exit 1

multinode-demo/wallet.sh

@@ -9,6 +9,9 @@ here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
 source "$here"/common.sh
 
+# shellcheck source=scripts/oom-score-adj.sh
+source "$here"/../scripts/oom-score-adj.sh
+
 # if $1 isn't host:path, something.com, or a valid local path
 if [[ ${1%:} != "$1" || "$1" =~ [^.]\.[^.] || -d $1 ]]; then
   leader=$1 # interpret