From c2a93cc8862f809ccb62ababdd6b079c45c9962e Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Tue, 29 Sep 2020 15:52:56 -0500 Subject: [PATCH] retrun confirmDownRetries to 10, tourney mac compatible At some point the cluster code was modified to do 120 tries to confirm if a node was down which is a bit excessive for production. My understanding is that this was done to help trigger or fix a problem during testing which is hopefully no longer relevant. Also changed the tournament script to use what I think are more standard bash-isms that work on mac. Please confirm this still works on Linux as well. --- cluster.go | 2 +- tournament.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cluster.go b/cluster.go index f31a819e5..10bc2b72d 100644 --- a/cluster.go +++ b/cluster.go @@ -62,7 +62,7 @@ const ( resizeJobActionAdd = "ADD" resizeJobActionRemove = "REMOVE" - defaultConfirmDownRetries = 120 + defaultConfirmDownRetries = 10 defaultConfirmDownSleep = 1 * time.Second ) diff --git a/tournament.sh b/tournament.sh index 2b2a559f8..31c3d42c3 100755 --- a/tournament.sh +++ b/tournament.sh @@ -8,5 +8,6 @@ for i in rbf lmdb roaring rbf_lmdb rbf_roaring lmdb_rbf lmdb_roaring roaring_rbf roaring_lmdb ; do echo "$(date) starting ${i}, output to tourna.log.${i}" echo "***=== ${i} ====================*** $(date)" &> tourna.log.${i} - PILOSA_TXSRC=${i} make testv-race &>> tourna.log.${i} + PILOSA_TXSRC=${i} make testv-race 2>&1 > tourna.log.${i} done +