summaryrefslogtreecommitdiffstats
path: root/auth/sample
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-11-03 14:38:21 -0500
committerInstrumental <jonathan.gathman@att.com>2018-11-04 08:50:48 -0600
commitca788dc542830b054f0a46df2dfd774fc318872c (patch)
treee560db799400396278923b7cf1dbf6b40834901a /auth/sample
parent014494d662fee62eb0911b693aa6baf0ba54e26f (diff)
Liveness for CSIT
Issue-ID: AAF-606 Change-Id: I740c153d36d7428fbe0b35e8e997d1a5603d6f63 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/sample')
-rw-r--r--auth/sample/bin/pod_wait.sh50
-rw-r--r--auth/sample/bin/service.sh3
2 files changed, 40 insertions, 13 deletions
diff --git a/auth/sample/bin/pod_wait.sh b/auth/sample/bin/pod_wait.sh
index 14350366..5a8d0625 100644
--- a/auth/sample/bin/pod_wait.sh
+++ b/auth/sample/bin/pod_wait.sh
@@ -27,6 +27,22 @@ function check {
fi
}
+function wait {
+ n=0
+ while [ $n -lt 40 ]; do
+ rv="$(check)"
+ echo "$rv"
+ if [ "$rv" = "ready" ]; then
+ echo "$OTHER is $rv"
+ n=10000
+ else
+ (( ++n ))
+ echo "Sleep 10 (iteration $n)"
+ sleep 10
+ fi
+ done
+}
+
function start {
n=0
while [ $n -lt 40 ]; do
@@ -45,18 +61,26 @@ function start {
done
}
-if [ "sleep" = "$OTHER" ]; then
- echo "Sleeping $1"
- status "Sleeping $1"
- sleep $1
- shift
- status "ready"
- echo "Done"
-else
- echo "App $APP is waiting to start until $OTHER is ready"
- status "waiting for $OTHER"
-
- start
-fi
+case "$OTHER" in
+ sleep)
+ echo "Sleeping $1"
+ status "Sleeping $1"
+ sleep $1
+ shift
+ status "ready"
+ echo "Done"
+ ;;
+ wait)
+ OTHER="$1"
+ shift
+ wait
+ ;;
+ *)
+ echo "App $APP is waiting to start until $OTHER is ready"
+ status "waiting for $OTHER"
+
+ start
+ ;;
+esac
eval "$@"
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 7e443b53..5116d36d 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -248,6 +248,9 @@ else
taillog)
sh /opt/app/osaaf/logs/taillog
;;
+ wait)
+ bash $CONFIG/bin/pod_wait.sh wait $1
+ ;;
--help | -?)
case "$1" in
"")