Attachment 832154 Details for Bug 1031801 – Proposed patch

[patch] Proposed patch

0001-Check-whether-db-needs-to-be-upgraded.patch (text/plain), 2.92 KB, created by Jakub Libosvar on 2013-12-03 15:31:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Libosvar

Created: 2013-12-03 15:31:20 UTC

Size: 2.92 KB

patch

obsolete

>From 02b318d526e92bbb3f4d5851325402407751a1e8 Mon Sep 17 00:00:00 2001
>From: Jakub Libosvar <jlibosva@redhat.com>
>Date: Mon, 2 Dec 2013 15:06:55 +0100
>Subject: [PATCH] Check whether db needs to be upgraded
>
>If neutron is upgraded from previous release (Grizzly) there
>needs to be run db upgrade before services are started. Starting
>services without upgrading db may lead into inconsistent behavior.
>Neutron service will not start if db is still from previous release
>while packages are from current release.
>
>Resolves: rhbz#1031801
>---
> neutron-server.init    | 8 ++++++++
> neutron-server.upstart | 9 +++++++++
> openstack-neutron.spec | 5 ++++-
> 3 files changed, 21 insertions(+), 1 deletion(-)
>
>diff --git a/neutron-server.init b/neutron-server.init
>index d5ccc9f..e85bf40 100644
>--- a/neutron-server.init
>+++ b/neutron-server.init
>@@ -11,6 +11,7 @@
> 
> prog=neutron
> exec="/usr/bin/$prog-server"
>+prev_release=grizzly
> configs=(
>     "/usr/share/$prog/$prog-dist.conf" \
>     "/etc/$prog/$prog.conf" \
>@@ -28,6 +29,7 @@ start() {
>     for config in ${configs[@]}; do
>         [ -f $config ] || exit 6
>     done
>+    check_db
>     echo -n $"Starting $prog: "
>     daemon --user neutron --pidfile $pidfile "$exec ${configs[@]/#/--config-file } --log-file $logfile &>/dev/null & echo \$! > $pidfile"
>     retval=$?
>@@ -66,6 +68,12 @@ rh_status_q() {
>     rh_status >/dev/null 2>&1
> }
> 
>+check_db() {
>+    if neutron-db-manage ${configs[@]/#/--config-file } current 2> /dev/null | awk '{ print $NF }' | grep -q $prev_release; then
>+        echo 'ERROR: You must upgrade the neutron database before starting neutron.'
>+        exit 1
>+    fi
>+}
> 
> case "$1" in
>     start)
>diff --git a/neutron-server.upstart b/neutron-server.upstart
>index ec14e41..9833e35 100644
>--- a/neutron-server.upstart
>+++ b/neutron-server.upstart
>@@ -1,5 +1,14 @@
> description "OpenStack Neutron Server"
> 
>+env prev_release=grizzly
>+
>+pre-start script
>+    if neutron-db-manage --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini current 2> /dev/null | awk '{ print $NF }' | grep -q $prev_release; then
>+        echo "ERROR: You must upgrade the neutron database before starting neutron."
>+        stop; exit 0
>+    fi
>+end script
>+
> start on stopped rc RUNLEVEL=[2345]
> stop on runlevel [S016]
> 
>diff --git a/openstack-neutron.spec b/openstack-neutron.spec
>index 9d23d5b..090fb4d 100644
>--- a/openstack-neutron.spec
>+++ b/openstack-neutron.spec
>@@ -5,7 +5,7 @@
> 
> Name:		openstack-neutron
> Version:	2013.2
>-Release:	10%{?dist}
>+Release:	11%{?dist}
> Provides:	openstack-quantum = %{version}-%{release}
> Obsoletes:	openstack-quantum < 2013.2-0.3.b3
> 
>@@ -999,6 +999,9 @@ fi
> 
> 
> %changelog
>+* Mon Dec 02 2013 Jakub Libosvar <jlibosva@redhat.com> - 2013.2-11
>+- Check whether db needs to be upgraded (rhbz#1031801)
>+
> * Tue Nov 19 2013 Alan Pevec <apevec@redhat.com> - 2013.2-10
> - update webob dependency to 1.2 (rhbz#1031849)
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1031801: 832154 | 832459 | 833198 | 834750 | 834845 | 834870