Merge pull request #3791 from bacongobbler/fixup-etcd-set-default

fix(*): check for key already exists errors only
deis · Jun 5, 2015 · d8f012d · d8f012d
2 parents 445e50d + 7b4ed1a
commit d8f012d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/builder/rootfs/bin/boot b/builder/rootfs/bin/boot
@@ -30,9 +30,10 @@ sleep $(($ETCD_TTL+1))
 
 function etcd_safe_mkdir {
 	set +e
-	etcdctl --no-sync -C $ETCD mkdir $1 >/dev/null 2>&1
-	if [[ $? -ne 0 && $? -ne 4 ]]; then
-		echo "etcd_safe_mkdir: an etcd error occurred. aborting..."
+	ERROR="$(etcdctl --no-sync -C $ETCD mkdir $1 2>&1 >/dev/null)"
+	if [[ $? -ne 0 && $(echo $ERROR | grep -ive "key already exists") ]]; then
+		echo "etcd_safe_mkdir: an etcd error occurred ($ERROR)"
+		echo "aborting..."
 		exit 1
 	fi
 	set -e

diff --git a/controller/bin/boot b/controller/bin/boot
@@ -26,19 +26,21 @@ sleep $(($ETCD_TTL+1))
 
 function etcd_set_default {
 	set +e
-	etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 >/dev/null 2>&1
-	if [[ $? -ne 0 && $? -ne 4 ]]; then
-		echo "etcd_set_default: an etcd error occurred. aborting..."
+	ERROR="$(etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 2>&1 >/dev/null)"
+	if [[ $? -ne 0 && $(echo $ERROR | grep -ive "key already exists") ]]; then
+		echo "etcd_set_default: an etcd error occurred ($ERROR)"
+		echo "aborting..."
 		exit 1
 	fi
 	set -e
 }
 
 function etcd_safe_mkdir {
 	set +e
-	etcdctl --no-sync -C $ETCD mkdir $1 >/dev/null 2>&1
-	if [[ $? -ne 0 && $? -ne 4 ]]; then
-		echo "etcd_safe_mkdir: an etcd error occurred. aborting..."
+	ERROR="$(etcdctl --no-sync -C $ETCD mkdir $1 2>&1 >/dev/null)"
+	if [[ $? -ne 0 && $(echo $ERROR | grep -ive "key already exists") ]]; then
+		echo "etcd_safe_mkdir: an etcd error occurred ($ERROR)"
+		echo "aborting..."
 		exit 1
 	fi
 	set -e

diff --git a/database/bin/boot b/database/bin/boot
@@ -28,9 +28,10 @@ sleep $(($ETCD_TTL+1))
 
 function etcd_set_default {
   set +e
-  etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 >/dev/null 2>&1
-  if [[ $? -ne 0 && $? -ne 4 ]]; then
-    echo "etcd_set_default: an etcd error occurred. aborting..."
+  ERROR="$(etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 2>&1 >/dev/null)"
+  if [[ $? -ne 0 && $(echo $ERROR | grep -ive "key already exists") ]]; then
+    echo "etcd_set_default: an etcd error occurred ($ERROR)"
+    echo "aborting..."
     exit 1
   fi
   set -e

diff --git a/registry/bin/boot b/registry/bin/boot
@@ -32,9 +32,10 @@ sleep $(($ETCD_TTL+1))
 
 function etcd_set_default {
   set +e
-  etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 >/dev/null 2>&1
-  if [[ $? -ne 0 && $? -ne 4 ]]; then
-    echo "etcd_set_default: an etcd error occurred. aborting..."
+  ERROR="$(etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 2>&1 >/dev/null)"
+  if [[ $? -ne 0 && $(echo $ERROR | grep -ive "key already exists") ]]; then
+    echo "etcd_set_default: an etcd error occurred ($ERROR)"
+    echo "aborting..."
     exit 1
   fi
   set -e

diff --git a/store/monitor/bin/boot b/store/monitor/bin/boot
@@ -10,9 +10,10 @@ HOSTNAME=`hostname`
 
 function etcd_set_default {
   set +e
-  etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 >/dev/null 2>&1
-  if [[ $? -ne 0 && $? -ne 4 ]]; then
-    echo "etcd_set_default: an etcd error occurred. aborting..."
+  ERROR="$(etcdctl --no-sync -C $ETCD mk $ETCD_PATH/$1 $2 2>&1 >/dev/null)"
+  if [[ $? -ne 0 && $(echo $ERROR | grep -ive "key already exists") ]]; then
+    echo "etcd_set_default: an etcd error occurred ($ERROR)"
+    echo "aborting..."
     exit 1
   fi
   set -e