openstack/devstack
Code Issues Proposed changes

Make stop_swift() more robust for Grenade

Browse Source 
stop_swift() wasn't calling screen_stop() so the pid files and screen
sessions were not being cleaned up.  DevStack doesn't really care but
Grenade does for the 'base' copy of DevStack.  This should be backported
to stable/havana for this reason.

Change-Id: Ib5afb321cef2b7ad74e69a3fd0d1dad469f78b11
This commit is contained in:
Dean Troyer 2014-03-06 11:49:22 -06:00
parent 3a07906d90
commit 1eae3e155a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/swift
View File

@ -687,6 +687,11 @@ function stop_swift {
swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
fi fi
# Dump all of the servers # Dump all of the servers
# Maintain the iteration as screen_stop() has some desirable side-effects
for type in proxy object container account; do
screen_stop s-${type}
done
# Blast out any stragglers
pkill -f swift- pkill -f swift-
} }