From 4eb676afaa1d9b5289d9f2b5bbca9f06827cab58 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 18 Jul 2018 08:10:03 -0700
Subject: [PATCH] Tunnel SOLANA_DEFAULT_METRICS_RATE into Snap nodes

---
 ci/testnet-deploy.sh     | 9 +++++++--
 multinode-demo/common.sh | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index a0b4237a06..a2b7a8757d 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -76,13 +76,18 @@ for info in "${vmlist[@]}"; do
   (
     SECONDS=0
     echo "--- $vmName in zone $vmZone $nodePosition"
+    commonNodeConfig="\
+      rust-log=$RUST_LOG \
+      default-metrics-rate=$SOLANA_DEFAULT_METRICS_RATE \
+      metrics-config=$SOLANA_METRICS_CONFIG \
+    "
     if $leader; then
-      nodeConfig="mode=leader+drone metrics-config=$SOLANA_METRICS_CONFIG"
+      nodeConfig="mode=leader+drone $commonNodeConfig"
       if [[ -n $SOLANA_CUDA ]]; then
         nodeConfig="$nodeConfig enable-cuda=1"
       fi
     else
-      nodeConfig="mode=validator metrics-config=$SOLANA_METRICS_CONFIG leader-address=$publicIp"
+      nodeConfig="mode=validator leader-address=$publicIp $commonNodeConfig"
     fi
 
     set -x
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index e0052d7b29..099448ee39 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -35,6 +35,7 @@ if [[ -d "$SNAP" ]]; then # Running inside a Linux Snap?
   mkdir -p "$SNAP_DATA"/{drone,leader,validator}
 
   SOLANA_METRICS_CONFIG="$(snapctl get metrics-config)"
+  SOLANA_DEFAULT_METRICS_RATE="$(snapctl get default-metrics-rate)"
   SOLANA_CUDA="$(snapctl get enable-cuda)"
   RUST_LOG="$(snapctl get rust-log)"