stop_swift() was not killing all swift processes properly. Change to
manually clean up all screen services with pkill.
Closes-bug: 1268794
Change-Id: Ibb7a2e0dd10a313609f05963264087f82f6f00e2
| ... | ... |
@@ -652,8 +652,10 @@ function stop_swift() {
|
| 652 | 652 |
if type -p swift-init >/dev/null; then |
| 653 | 653 |
swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
|
| 654 | 654 |
fi |
| 655 |
- # Dump the proxy server |
|
| 656 |
- sudo pkill -f swift-proxy-server |
|
| 655 |
+ for type in proxy object container account; do |
|
| 656 |
+ # Dump all of the servers |
|
| 657 |
+ pkill -f swift- |
|
| 658 |
+ done |
|
| 657 | 659 |
} |
| 658 | 660 |
|
| 659 | 661 |
# Restore xtrace |