openstack/kolla
Code Issues Proposed changes

Revert the patch set "Apply Swift rolling upgrade"

Browse Source 
Due to there is no way to execute swift graceful shutdown commands
from swift-bootstrap container to swift service containers, so
we need to revert the patch set at [1].

[1] https://review.openstack.org/#/c/560248/

Change-Id: I3363895347c535054584d63e22284c211ca38ad6
This commit is contained in:
Ha Manh Dong 2018-08-06 16:09:06 +07:00
parent 695d4d603d
commit 065651a3fb
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/swift/swift-proxy-server/Dockerfile.j2
View File

@ -30,9 +30,6 @@ RUN {{ macros.install_pip(swift_proxy_server_pip_packages | customizable("pip_pa
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block swift_proxy_server_footer %}{% endblock %}
{% block footer %}{% endblock %}

8
docker/swift/swift-proxy-server/extend_start.sh
View File

@ -1,8 +0,0 @@
#!/bin/bash
# Gracefully stop swift proxy and exit if KOLLA_STOP_SERVICES variable is set.
if [[ "${!KOLLA_STOP_SERVICES[@]}" ]]; then
echo "Gracefully Shutdown all Swift proxy processes"
swift-init proxy shutdown
exit
fi

9
docker/swift/swift-rsyncd/extend_start.sh
View File

@ -2,12 +2,3 @@
sudo chown -R swift:swift /srv/node
mkdir -p /var/lib/swift/lock
# Migrate swift database and exit if KOLLA_STOP_SERVICES variable is set.
if [[ "${!KOLLA_STOP_SERVICES[@]}" ]]; then
echo "Stop background Swift jobs"
swift-init rest stop
echo "Gracefully Shutdown all Swift storage processes"
swift-init {account|container|object} shutdown
exit
fi