From 517dc8a54ea6bb66f18a2a33732e7c19c5ca972b Mon Sep 17 00:00:00 2001 From: jwaldrip Date: Wed, 16 Aug 2017 16:56:08 -0600 Subject: [PATCH] fix the master sentinel --- build-and-push.sh | 2 +- k8s/redis-node-statefulset.yaml | 2 +- sidecar.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build-and-push.sh b/build-and-push.sh index f702aaf..2034df1 100755 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -image="commercialtribe/redis-sentinel-sidecar:v20170816.18" +image="commercialtribe/redis-sentinel-sidecar:v20170816.19" login(){ docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD diff --git a/k8s/redis-node-statefulset.yaml b/k8s/redis-node-statefulset.yaml index 2758bd7..401fc50 100644 --- a/k8s/redis-node-statefulset.yaml +++ b/k8s/redis-node-statefulset.yaml @@ -58,7 +58,7 @@ spec: # Sidecar - name: redis-sidecar - image: commercialtribe/redis-sentinel-sidecar:v20170816.18 + image: commercialtribe/redis-sentinel-sidecar:v20170816.19 imagePullPolicy: Always env: - name: POD_NAMESPACE diff --git a/sidecar.sh b/sidecar.sh index 5947214..78e0e47 100644 --- a/sidecar.sh +++ b/sidecar.sh @@ -122,6 +122,9 @@ boot(){ # wait, as things may still be failing over sleep $(($failover_timeout / 1000)) + # Montior this host by default + sentinel-monitor $ip + # Check to ensure both the sentinel and redis are up, # if not, exit with an error ping-both || panic "redis and/or sentinel is not up"