From cc0e455a511c139e6d72032d9cb25cbc9bc48021 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 5 Aug 2019 17:10:36 -0700
Subject: [PATCH] Skip sanity on blockstreamer node at cluster boot.

It may not have caught up to the bootstrap leader yet...
---
 net/net.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/net.sh b/net/net.sh
index 0422745bba..c328dd978a 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -491,6 +491,8 @@ startClient() {
 }
 
 sanity() {
+  declare skipBlockstreamerSanity=$1
+
   $metricsWriteDatapoint "testnet-deploy net-sanity-begin=1"
 
   declare ok=true
@@ -508,7 +510,7 @@ sanity() {
   ) || ok=false
   $ok || exit 1
 
-  if [[ -n $blockstreamer ]]; then
+  if [[ -z $skipBlockstreamerSanity && -n $blockstreamer ]]; then
     # If there's a blockstreamer node run a reduced sanity check on it as well
     echo "--- Sanity: $blockstreamer"
     (
@@ -675,7 +677,8 @@ deploy() {
       stopNode "$ipAddress" true
     done
   fi
-  sanity
+  sanity skipBlockstreamerSanity # skip sanity on blockstreamer node, it may not
+                                 # have caught up to the bootstrap leader yet
 
   SECONDS=0
   for ((i=0; i < "$numClients" && i < "$numClientsRequested"; i++)) do