1. devstack
  2. Commit 1eae3e155a25faa8e0bb6ddba77e580c774fd265
Browse code

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 should be 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 @ 1eae3e1
... ... 
@@ -687,6 +687,11 @@ function stop_swift {
687 687 
         swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
688 688 
     fi
689 689 
     # Dump all of the servers
690 
+    # Maintain the iteration as screen_stop() has some desirable side-effects
691 
+    for type in proxy object container account; do
692 
+        screen_stop s-${type}
693 
+    done
694 
+    # Blast out any stragglers
690 695 
     pkill -f swift-
691 696 
 }
692 697