1. devstack
  2. Commit 1ed64cbbf09d76df0b1ce0d5095373c2bf1053c6
Browse code

Ensure cm-api is ready before start cm-alarm

The patch ensure that ceilometer-api is ready before
starting the ceilometer-alarm-evaluator service.

This ensure that ceilometer-alarm-evaluator doesn't log a error message
on startup due to not yet available ceilometer-api.

Closes bug: #1243249

Change-Id: Icff3e972ec485f26c014071f68079593a14b7240

Mehdi Abaakouk authored on 2013/10/23 17:37:05
Showing 1 changed files
lib/ceilometer
History View file @ 1ed64cb
... ... 
@@ -138,6 +138,12 @@ function start_ceilometer() {
138 138 
     screen_it ceilometer-acentral "cd ; ceilometer-agent-central --config-file $CEILOMETER_CONF"
139 139 
     screen_it ceilometer-collector "cd ; ceilometer-collector --config-file $CEILOMETER_CONF"
140 140 
     screen_it ceilometer-api "cd ; ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"
141 
+
142 
+    echo "Waiting for ceilometer-api to start..."
143 
+    if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -s http://localhost:8777/v2/ >/dev/null; do sleep 1; done"; then
144 
+        die $LINENO "ceilometer-api did not start"
145 
+    fi
146 
+
141 147 
     screen_it ceilometer-alarm-notifier "cd ; ceilometer-alarm-notifier --config-file $CEILOMETER_CONF"
142 148 
     screen_it ceilometer-alarm-evaluator "cd ; ceilometer-alarm-evaluator --config-file $CEILOMETER_CONF"
143 149 
 }