Attachment 676014 Details for Bug 877343 – Candidate fix 1

[patch] Candidate fix 1

openstack-swift-bz885530-1.diff (text/plain), 9.38 KB, created by Pete Zaitcev on 2013-01-10 04:06:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2013-01-10 04:06:04 UTC

Size: 9.38 KB

patch

obsolete

>diff --git a/openstack-swift-account.init b/openstack-swift-account.init
>index 922963a..fe0aafe 100644
>--- a/openstack-swift-account.init
>+++ b/openstack-swift-account.init
>@@ -18,20 +18,21 @@
> . /usr/share/openstack-swift/functions
> 
> name="account"
>+subserv="server"
> 
> [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name"
> 
>-lockfile="/var/lock/subsys/openstack-swift-account"
>+lockfile="/var/lock/subsys/openstack-swift-$name-$subserv"
> 
> start() {
>-    swift_action "$name" start
>+    swift_action "$name" $subserv start
>     retval=$?
>     [ $retval -eq 0 ] && touch $lockfile
>     return $retval
> }
> 
> stop() {
>-    swift_action "$name" stop
>+    swift_action "$name" $subserv stop
>     retval=$?
>     [ $retval -eq 0 ] && rm -f $lockfile
>     return $retval
>@@ -43,7 +44,7 @@ restart() {
> }
> 
> rh_status() {
>-    swift_action "$name" status
>+    swift_action "$name" $subserv status
> }
> 
> rh_status_q() {
>diff --git a/openstack-swift-container.init b/openstack-swift-container.init
>index 65bcd32..0341287 100644
>--- a/openstack-swift-container.init
>+++ b/openstack-swift-container.init
>@@ -18,20 +18,21 @@
> . /usr/share/openstack-swift/functions
> 
> name="container"
>+subserv="server"
> 
> [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name"
> 
>-lockfile="/var/lock/subsys/openstack-swift-container"
>+lockfile="/var/lock/subsys/openstack-swift-$name-$subserv"
> 
> start() {
>-    swift_action "$name" start
>+    swift_action "$name" "$subserv" start
>     retval=$?
>     [ $retval -eq 0 ] && touch $lockfile
>     return $retval
> }
> 
> stop() {
>-    swift_action "$name" stop
>+    swift_action "$name" "$subserv" stop
>     retval=$?
>     [ $retval -eq 0 ] && rm -f $lockfile
>     return $retval
>@@ -43,7 +44,7 @@ restart() {
> }
> 
> rh_status() {
>-    swift_action "$name" status
>+    swift_action "$name" "$subserv" status
> }
> 
> rh_status_q() {
>diff --git a/openstack-swift-object.init b/openstack-swift-object.init
>index 0f8c107..78061e4 100644
>--- a/openstack-swift-object.init
>+++ b/openstack-swift-object.init
>@@ -18,20 +18,21 @@
> . /usr/share/openstack-swift/functions
> 
> name="object"
>+subserv="server"
> 
> [ -e "/etc/sysconfig/openstack-swift-$name" ] && . "/etc/sysconfig/openstack-swift-$name"
> 
>-lockfile="/var/lock/subsys/openstack-swift-object"
>+lockfile="/var/lock/subsys/openstack-swift-$name-$subserv"
> 
> start() {
>-    swift_action "$name" start
>+    swift_action "$name" "$subserv" start
>     retval=$?
>     [ $retval -eq 0 ] && touch $lockfile
>     return $retval
> }
> 
> stop() {
>-    swift_action "$name" stop
>+    swift_action "$name" "$subserv" stop
>     retval=$?
>     [ $retval -eq 0 ] && rm -f $lockfile
>     return $retval
>@@ -43,7 +44,7 @@ restart() {
> }
> 
> rh_status() {
>-    swift_action "$name" status
>+    swift_action "$name" "$subserv" status
> }
> 
> rh_status_q() {
>diff --git a/openstack-swift.spec b/openstack-swift.spec
>index 73a42ea..89eb198 100644
>--- a/openstack-swift.spec
>+++ b/openstack-swift.spec
>@@ -6,7 +6,7 @@
> 
> Name:             openstack-swift
> Version:          1.7.4
>-Release:          2%{?dist}
>+Release:          2.1%{?dist}
> Summary:          OpenStack Object Storage (swift)
> 
> Group:            Development/Languages
>@@ -18,12 +18,32 @@ Source1:          %{name}-functions
> Source2:          %{name}-account.init
> Source22:         account-server.conf
> Source200:        %{name}-account.upstart
>+Source201:        %{name}-account-auditor.upstart
>+Source202:        %{name}-account-reaper.upstart
>+Source203:        %{name}-account-replicator.upstart
>+Source211:        %{name}-account-auditor.init
>+Source212:        %{name}-account-reaper.init
>+Source213:        %{name}-account-replicator.init
> Source4:          %{name}-container.init
> Source42:         container-server.conf
> Source400:        %{name}-container.upstart
>+Source401:        %{name}-container-auditor.upstart
>+Source402:        %{name}-container-replicator.upstart
>+Source403:        %{name}-container-updater.upstart
>+Source411:        %{name}-container-auditor.init
>+Source412:        %{name}-container-replicator.init
>+Source413:        %{name}-container-updater.init
> Source5:          %{name}-object.init
> Source52:         object-server.conf
> Source500:        %{name}-object.upstart
>+Source501:        %{name}-object-auditor.upstart
>+Source502:        %{name}-object-expirer.upstart
>+Source503:        %{name}-object-replicator.upstart
>+Source504:        %{name}-object-updater.upstart
>+Source511:        %{name}-object-auditor.init
>+Source512:        %{name}-object-expirer.init
>+Source513:        %{name}-object-replicator.init
>+Source514:        %{name}-object-updater.init
> Source6:          %{name}-proxy.init
> Source61:         proxy-server.conf
> Source600:        %{name}-proxy.upstart
>@@ -183,13 +203,33 @@ rm -rf %{buildroot}
> install -p -D -m 644 %{SOURCE1} %{buildroot}%{_datarootdir}/%{name}/functions
> # Install upstart jobs examples
> install -p -m 644 %{SOURCE200} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE201} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE202} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE203} %{buildroot}%{_datadir}/%{name}
> install -p -m 644 %{SOURCE400} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE401} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE402} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE403} %{buildroot}%{_datadir}/%{name}
> install -p -m 644 %{SOURCE500} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE501} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE502} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE503} %{buildroot}%{_datadir}/%{name}
>+install -p -m 644 %{SOURCE504} %{buildroot}%{_datadir}/%{name}
> install -p -m 644 %{SOURCE600} %{buildroot}%{_datadir}/%{name}
> # Init scripts
> install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}-account
>+install -p -D -m 755 %{SOURCE211} %{buildroot}%{_initrddir}/%{name}-account-auditor
>+install -p -D -m 755 %{SOURCE212} %{buildroot}%{_initrddir}/%{name}-account-reaper
>+install -p -D -m 755 %{SOURCE213} %{buildroot}%{_initrddir}/%{name}-account-replicator
> install -p -D -m 755 %{SOURCE4} %{buildroot}%{_initrddir}/%{name}-container
>+install -p -D -m 755 %{SOURCE411} %{buildroot}%{_initrddir}/%{name}-container-auditor
>+install -p -D -m 755 %{SOURCE412} %{buildroot}%{_initrddir}/%{name}-container-replicator
>+install -p -D -m 755 %{SOURCE413} %{buildroot}%{_initrddir}/%{name}-container-updater
> install -p -D -m 755 %{SOURCE5} %{buildroot}%{_initrddir}/%{name}-object
>+install -p -D -m 755 %{SOURCE511} %{buildroot}%{_initrddir}/%{name}-object-auditor
>+install -p -D -m 755 %{SOURCE512} %{buildroot}%{_initrddir}/%{name}-object-expirer
>+install -p -D -m 755 %{SOURCE513} %{buildroot}%{_initrddir}/%{name}-object-replicator
>+install -p -D -m 755 %{SOURCE514} %{buildroot}%{_initrddir}/%{name}-object-updater
> install -p -D -m 755 %{SOURCE6} %{buildroot}%{_initrddir}/%{name}-proxy
> # Remove tests
> rm -fr %{buildroot}/%{python_sitelib}/test
>@@ -302,7 +342,6 @@ fi
> %{_mandir}/man1/swift-recon.1*
> %{_mandir}/man1/swift-ring-builder.1*
> %dir %{_datarootdir}/%{name}/functions
>-%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift
> %dir %{_sysconfdir}/swift
> %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf
> %dir %attr(0755, swift, root) %{_localstatedir}/run/swift
>@@ -328,9 +367,8 @@ fi
> %files account
> %defattr(-,root,root,-)
> %doc etc/account-server.conf-sample
>-%dir %{_initrddir}/%{name}-account
>-%{_datadir}/%{name}/%{name}-account.upstart
>-%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/account-server
>+%{_initrddir}/%{name}-account*
>+%{_datadir}/%{name}/%{name}-account*.upstart
> %{_mandir}/man5/account-server.conf.5*
> %{_mandir}/man1/swift-account-auditor.1*
> %{_mandir}/man1/swift-account-reaper.1*
>@@ -348,9 +386,8 @@ fi
> %files container
> %defattr(-,root,root,-)
> %doc etc/container-server.conf-sample
>-%dir %{_initrddir}/%{name}-container
>-%{_datadir}/%{name}/%{name}-container.upstart
>-%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/container-server
>+%{_initrddir}/%{name}-container*
>+%{_datadir}/%{name}/%{name}-container*.upstart
> %{_mandir}/man5/container-server.conf.5*
> %{_mandir}/man1/swift-container-auditor.1*
> %{_mandir}/man1/swift-container-replicator.1*
>@@ -370,9 +407,8 @@ fi
> %files object
> %defattr(-,root,root,-)
> %doc etc/object-server.conf-sample etc/rsyncd.conf-sample
>-%dir %{_initrddir}/%{name}-object
>-%{_datadir}/%{name}/%{name}-object.upstart
>-%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server
>+%{_initrddir}/%{name}-object*
>+%{_datadir}/%{name}/%{name}-object*.upstart
> %{_mandir}/man5/object-server.conf.5*
> %{_mandir}/man5/object-expirer.conf.5*
> %{_mandir}/man1/swift-object-auditor.1*
>@@ -396,7 +432,6 @@ fi
> %doc etc/proxy-server.conf-sample
> %dir %{_initrddir}/%{name}-proxy
> %{_datadir}/%{name}/%{name}-proxy.upstart
>-%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/proxy-server
> %{_mandir}/man5/proxy-server.conf.5*
> %{_mandir}/man1/swift-proxy-server.1*
> %dir %{_sysconfdir}/swift/proxy-server
>@@ -410,6 +445,10 @@ fi
> %doc LICENSE doc/build/html
> 
> %changelog
>+* Wed Jan 09 2013 Pete Zaitcev <zaitcev@redhat.com> - 1.7.4-2.1
>+- Add missing Upstart jobs and init scripts for daemons, bz#885530
>+- Drop duplicated /var/run directories from the spec
>+
> * Tue Oct 09 2012 Derek Higgins <derekh@redhat.com> - 1.7.4-2
> - removing reference to tmpfiles.d/openstack-swift.conf in packaging
> - adding python-swiftclient as a BuildRequires

Actions: View | Diff

Attachments on bug 877343: 676014 | 676015 | 676543 | 700131