1. devstack
  2. Commit 9fb6c3046ef5fc7ee644f68a5261fb1c73ec8522
Browse code

Backport 'Make stop_swift() more robust for Grenade'

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 is backported
to stable/havana for this reason.

Change-Id: Ib5afb321cef2b7ad74e69a3fd0d1dad469f78b11

Dean Troyer authored on 2014/03/07 02:49:22
Showing 1 changed files
lib/swift
History View file @ 9fb6c30
... ... 
@@ -620,6 +620,11 @@ function stop_swift() {
620 620 
         swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
621 621 
     fi
622 622 
     # Dump all of the servers
623 
+    # Maintain the iteration as screen_stop() has some desirable side-effects
624 
+    for type in proxy object container account; do
625 
+        screen_stop s-${type}
626 
+    done
627 
+    # Blast out any stragglers
623 628 
     pkill -f swift-
624 629 
 }
625 630