Update fetch-perf-libs.sh

we can't verify a live ledger, unfortunately, fixes #985

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana"
 description = "Blockchain, Rebuilt for Scale"
-version = "0.7.1"
+version = "0.7.2"
 documentation = "https://docs.rs/solana"
 homepage = "http://solana.com/"
 readme = "README.md"

ci/buildkite.yml

@@ -1,10 +1,10 @@
 steps:
-  - command: "ci/docker-run.sh solanalabs/rust ci/test-stable.sh"
+  - command: "ci/docker-run.sh solanalabs/rust:1.28.0 ci/test-stable.sh"
     name: "stable [public]"
     env:
       CARGO_TARGET_CACHE_NAME: "stable"
     timeout_in_minutes: 30
-  - command: "ci/docker-run.sh solanalabs/rust ci/test-bench.sh"
+  - command: "ci/docker-run.sh solanalabs/rust:1.28.0 ci/test-bench.sh"
     name: "bench [public]"
     env:
       CARGO_TARGET_CACHE_NAME: "stable"
@@ -12,7 +12,7 @@ steps:
   - command: "ci/shellcheck.sh"
     name: "shellcheck [public]"
     timeout_in_minutes: 20
-  - command: "ci/docker-run.sh solanalabs/rust-nightly ci/test-nightly.sh"
+  - command: "ci/docker-run.sh solanalabs/rust-nightly:2018-08-14 ci/test-nightly.sh"
     name: "nightly [public]"
     env:
       CARGO_TARGET_CACHE_NAME: "nightly"
@@ -24,8 +24,8 @@ steps:
     timeout_in_minutes: 20
     agents:
       - "queue=cuda"
-  - command: "ci/test-large-network.sh"
-    name: "large-network [public]"
+  - command: "ci/test-large-network.sh || true"
+    name: "large-network [public] [ignored]"
     env:
       CARGO_TARGET_CACHE_NAME: "stable"
     timeout_in_minutes: 20

ci/snap.sh

@@ -11,7 +11,9 @@ fi
 # when this script is run from a triggered pipeline, TRIGGERED_BUILDKITE_TAG is
 # used instead of BUILDKITE_TAG (due to Buildkite limitations that prevents
 # BUILDKITE_TAG from propagating through to triggered pipelines)
-if [[ -z "$BUILDKITE_TAG" && -z "$TRIGGERED_BUILDKITE_TAG" ]]; then
+if [[ -n "$BUILDKITE_TAG" || -n "$TRIGGERED_BUILDKITE_TAG" ]]; then
+  SNAP_CHANNEL=stable
+elif [[ $BUILDKITE_BRANCH = master ]]; then
   SNAP_CHANNEL=edge
 else
   SNAP_CHANNEL=beta
@@ -43,11 +45,11 @@ if [[ ! -x /usr/bin/multilog ]]; then
   exit 1
 fi
 
-echo --- build
+echo --- build: $SNAP_CHANNEL channel
 snapcraft
 
 source ci/upload_ci_artifact.sh
 upload_ci_artifact solana_*.snap
 
-echo --- publish
+echo --- publish: $SNAP_CHANNEL channel
 $DRYRUN snapcraft push solana_*.snap --release $SNAP_CHANNEL

ci/testnet-deploy.sh

@@ -17,6 +17,51 @@ if [[ -z $SOLANA_METRICS_CONFIG ]]; then
   exit 1
 fi
 
+
+# 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
+
 # Default to edge channel.  To select the beta channel:
 #   export SOLANA_SNAP_CHANNEL=beta
 if [[ -z $SOLANA_SNAP_CHANNEL ]]; then
@@ -70,7 +115,10 @@ fi
 SNAP_INSTALL_CMD="sudo snap remove solana; $SNAP_INSTALL_CMD"
 
 EARLYOOM_INSTALL_CMD="\
-  wget -O install-earlyoom.sh https://raw.githubusercontent.com/solana-labs/solana/master/ci/install-earlyoom.sh; \
+  wget --retry-connrefused --waitretry=1 \
+    --read-timeout=20 --timeout=15 --tries=5 \
+    -O install-earlyoom.sh \
+    https://raw.githubusercontent.com/solana-labs/solana/v0.7/ci/install-earlyoom.sh; \
   bash install-earlyoom.sh \
 "
 SNAP_INSTALL_CMD="$EARLYOOM_INSTALL_CMD; $SNAP_INSTALL_CMD"

ci/testnet-sanity.sh

@@ -17,12 +17,21 @@ if [[ -z $EXPECTED_NODE_COUNT ]]; then
 fi
 
 echo "--- $NET_URL: verify ledger"
-if [[ -d /var/snap/solana/current/config/ledger ]]; then
-  # Note: here we assume this script is actually running on the leader node...
-  sudo solana.ledger-tool --ledger /var/snap/solana/current/config/ledger verify
+if [[ -z $NO_LEDGER_VERIFY ]]; then
+  if [[ -d /var/snap/solana/current/config/ledger ]]; then
+    # Note: here we assume this script is actually running on the leader node...
+    (
+      set -x
+      sudo cp -r /var/snap/solana/current/config/ledger /var/snap/solana/current/config/ledger-verify-$$
+      sudo solana.ledger-tool --ledger /var/snap/solana/current/config/ledger-verify-$$ verify
+    )
+  else
+    echo "^^^ +++"
+    echo "Ledger verify skipped"
+  fi
 else
   echo "^^^ +++"
-  echo "Ledger verify skipped"
+  echo "Ledger verify skipped (NO_LEDGER_VERIFY defined)"
 fi
 
 echo "--- $NET_URL: wallet sanity"
@@ -54,13 +63,15 @@ if [[ -z $NO_VALIDATOR_SANITY ]]; then
   )
   wc -l validator.log
   if grep -C100 panic validator.log; then
-    echo "^^^ +++ Panic observed"
+    echo "^^^ +++"
+    echo "Panic observed"
     exit 1
   else
     echo "Validator log looks ok"
   fi
 else
-  echo "^^^ +++ Validator sanity disabled (NO_VALIDATOR_SANITY defined)"
+  echo "^^^ +++"
+  echo "Validator sanity disabled (NO_VALIDATOR_SANITY defined)"
 fi
 
 exit 0

fetch-perf-libs.sh

@@ -13,7 +13,7 @@ fi
 (
   set -x
   curl -o solana-perf.tgz \
-    https://solana-perf.s3.amazonaws.com/master/x86_64-unknown-linux-gnu/solana-perf.tgz
+    https://solana-perf.s3.amazonaws.com/v0.8.0/x86_64-unknown-linux-gnu/solana-perf.tgz
   tar zxvf solana-perf.tgz
 )
 

src/bin/bench-tps.rs

@@ -689,7 +689,6 @@ fn converge(
             .unwrap()
             .table
             .values()
-            .into_iter()
             .filter(|x| Crdt::is_valid_address(x.contact_info.rpu))
             .cloned()
             .collect();