openstack/devstack
Code Issues Proposed changes

Implement screen process stop() function

Browse Source 
Implements screen process stop in ceilometer, cinder, glance, heat, n-vol

Change-Id: Ic5e02926f026d0e6f4b39846bfe77634dd414c60
This commit is contained in:
Dean Troyer 2012-09-10 14:10:27 -05:00
parent 9dce274dac
commit 699a29f72d
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ceilometer
View File

@ -72,5 +72,13 @@ function start_ceilometer() {
screen_it ceilometer-api "cd $CEILOMETER_DIR && $CEILOMETER_BIN_DIR/ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR" screen_it ceilometer-api "cd $CEILOMETER_DIR && $CEILOMETER_BIN_DIR/ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR"
} }
# stop_ceilometer() - Stop running processes
function stop_ceilometer() {
# Kill the ceilometer screen windows
for serv in ceilometer-acompute ceilometer-acentral ceilometer-collector ceilometer-api; do
screen -S $SCREEN_NAME -p $serv -X kill
done
}
# Restore xtrace # Restore xtrace
$XTRACE $XTRACE

7
lib/cinder
View File

@ -225,9 +225,12 @@ function start_cinder() {
screen_it c-sch "cd $CINDER_DIR && $CINDER_BIN_DIR/cinder-scheduler --config-file $CINDER_CONF" screen_it c-sch "cd $CINDER_DIR && $CINDER_BIN_DIR/cinder-scheduler --config-file $CINDER_CONF"
} }
# stop_cinder() - Stop running processes (non-screen) # stop_cinder() - Stop running processes
function stop_cinder() { function stop_cinder() {
# FIXME(dtroyer): stop only the cinder screen window? # Kill the cinder screen windows
for serv in c-api c-sch c-vol; do
screen -S $SCREEN_NAME -p $serv -X kill
done
if is_service_enabled c-vol; then if is_service_enabled c-vol; then
stop_service tgt stop_service tgt

2
lib/glance
View File

@ -169,7 +169,7 @@ function start_glance() {
fi fi
} }
# stop_glance() - Stop running processes (non-screen) # stop_glance() - Stop running processes
function stop_glance() { function stop_glance() {
# Kill the Glance screen windows # Kill the Glance screen windows
screen -S $SCREEN_NAME -p g-api -X kill screen -S $SCREEN_NAME -p g-api -X kill

8
lib/heat
View File

@ -173,10 +173,12 @@ function start_heat() {
screen_it h-meta "cd $HEAT_DIR; bin/heat-metadata --config-dir=$HEAT_CONF_DIR/heat-metadata.conf" screen_it h-meta "cd $HEAT_DIR; bin/heat-metadata --config-dir=$HEAT_CONF_DIR/heat-metadata.conf"
} }
# stop_heat() - Stop running processes (non-screen) # stop_heat() - Stop running processes
function stop_heat() { function stop_heat() {
# This function intentionally left blank # Kill the cinder screen windows
: for serv in h-eng h-api-cfn h-api-cw h-meta; do
screen -S $SCREEN_NAME -p $serv -X kill
done
} }
# Restore xtrace # Restore xtrace

5
lib/n-vol
View File

@ -114,9 +114,10 @@ function start_nvol() {
screen_it n-vol "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-volume" screen_it n-vol "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-volume"
} }
# stop_nvol() - Stop running processes (non-screen) # stop_nvol() - Stop running processes
function stop_nvol() { function stop_nvol() {
# FIXME(dtroyer): stop only the n-vol screen window? # Kill the nova volume screen window
screen -S $SCREEN_NAME -p n-vol -X kill
stop_service tgt stop_service tgt
} }