Attachment 706212 Details for Bug 916622 – Candidate 3

[patch] Candidate 3

openstack-swift-bz916622-3.diff (text/plain), 11.16 KB, created by Pete Zaitcev on 2013-03-06 19:01:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2013-03-06 19:01:33 UTC

Size: 11.16 KB

patch

obsolete

>diff --git a/object-expirer.conf b/object-expirer.conf
>new file mode 100644
>index 0000000..b75963c
>--- /dev/null
>+++ b/object-expirer.conf
>@@ -0,0 +1,17 @@
>+[DEFAULT]
>+
>+[object-expirer]
>+# auto_create_account_prefix = .
>+
>+[pipeline:main]
>+pipeline = catch_errors cache proxy-server
>+
>+[app:proxy-server]
>+use = egg:swift#proxy
>+
>+[filter:cache]
>+use = egg:swift#memcache
>+memcache_servers = 127.0.0.1:11211
>+
>+[filter:catch_errors]
>+use = egg:swift#catch_errors
>diff --git a/openstack-swift-account-auditor.init b/openstack-swift-account-auditor.init
>index 6ed736c..6123fcf 100644
>--- a/openstack-swift-account-auditor.init
>+++ b/openstack-swift-account-auditor.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-account
>+# Provides:          openstack-swift-account-auditor
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>diff --git a/openstack-swift-account-reaper.init b/openstack-swift-account-reaper.init
>index 35e62b9..2365fbb 100644
>--- a/openstack-swift-account-reaper.init
>+++ b/openstack-swift-account-reaper.init
>@@ -9,7 +9,7 @@
> # Description:       Account reaper for swift.
> ### END INIT INFO
> 
>-# openstack-swift-account: swift account reaper
>+# openstack-swift-account-reaper: swift account reaper
> #
> # chkconfig: - 98 02
> # description: Account reaper for swift.
>diff --git a/openstack-swift-account-replicator.init b/openstack-swift-account-replicator.init
>index 258bac3..9d12d8e 100644
>--- a/openstack-swift-account-replicator.init
>+++ b/openstack-swift-account-replicator.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-account
>+# Provides:          openstack-swift-account-replicator
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Account replicator for swift.
> ### END INIT INFO
> 
>-# openstack-swift-account: swift account replicator
>+# openstack-swift-account-replicator: swift account replicator
> #
> # chkconfig: - 98 02
> # description: Account replicator for swift.
>diff --git a/openstack-swift-container-auditor.init b/openstack-swift-container-auditor.init
>index 5e260b2..d07368b 100644
>--- a/openstack-swift-container-auditor.init
>+++ b/openstack-swift-container-auditor.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-container
>+# Provides:          openstack-swift-container-auditor
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Container auditor for swift.
> ### END INIT INFO
> 
>-# openstack-swift-container: swift container auditor
>+# openstack-swift-container-auditor: swift container auditor
> #
> # chkconfig: - 98 02
> # description: Container auditor for swift.
>diff --git a/openstack-swift-container-replicator.init b/openstack-swift-container-replicator.init
>index c49c39b..8b57a34 100644
>--- a/openstack-swift-container-replicator.init
>+++ b/openstack-swift-container-replicator.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-container
>+# Provides:          openstack-swift-container-replicator
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Container replicator for swift.
> ### END INIT INFO
> 
>-# openstack-swift-container: swift container replicator
>+# openstack-swift-container-replicator: swift container replicator
> #
> # chkconfig: - 98 02
> # description: Container replicator for swift.
>diff --git a/openstack-swift-container-updater.init b/openstack-swift-container-updater.init
>index 6e70518..a079f53 100644
>--- a/openstack-swift-container-updater.init
>+++ b/openstack-swift-container-updater.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-container
>+# Provides:          openstack-swift-container-updater
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Container updater for swift.
> ### END INIT INFO
> 
>-# openstack-swift-container: swift container updater
>+# openstack-swift-container-updater: swift container updater
> #
> # chkconfig: - 98 02
> # description: Container updater for swift.
>diff --git a/openstack-swift-object-auditor.init b/openstack-swift-object-auditor.init
>index 11f32fc..318131b 100644
>--- a/openstack-swift-object-auditor.init
>+++ b/openstack-swift-object-auditor.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-object
>+# Provides:          openstack-swift-object-auditor
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Object auditor for swift.
> ### END INIT INFO
> 
>-# openstack-swift-object: swift object auditor
>+# openstack-swift-object-auditor: swift object auditor
> #
> # chkconfig: - 98 02
> # description: Object auditor for swift.
>diff --git a/openstack-swift-object-expirer.init b/openstack-swift-object-expirer.init
>index 097ac68..0127872 100644
>--- a/openstack-swift-object-expirer.init
>+++ b/openstack-swift-object-expirer.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-object
>+# Provides:          openstack-swift-object-expirer
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Object expirer for swift.
> ### END INIT INFO
> 
>-# openstack-swift-object: swift object expirer
>+# openstack-swift-object-expirer: swift object expirer
> #
> # chkconfig: - 98 02
> # description: Object expirer for swift.
>@@ -24,15 +24,35 @@ subserv="expirer"
> 
> lockfile="/var/lock/subsys/openstack-swift-$name-$subserv"
> 
>+# The Object expirer defies the regular conventions enough that we have to
>+# introspect into functions a bit. Fortunately all we need is a minute change
>+# to swift_action.
>+swift_action_expirer() {
>+  retval=0
>+  server="$1"
>+  subserv="$2"
>+  call="swift_$3"
>+
>+  if [[ -f "/etc/swift/$server-$subserv.conf" ]]; then
>+    $call "$server-$subserv" \
>+          "/etc/swift/$server-$subserv.conf" \
>+          "/var/run/swift/$server-$subserv.pid"
>+    [ $? -ne 0 ] && retval=1
>+  else
>+    retval=1
>+  fi
>+  return $retval
>+}
>+
> start() {
>-    swift_action "$name" "$subserv" start
>+    swift_action_expirer "$name" "$subserv" start
>     retval=$?
>     [ $retval -eq 0 ] && touch $lockfile
>     return $retval
> }
> 
> stop() {
>-    swift_action "$name" "$subserv" stop
>+    swift_action_expirer "$name" "$subserv" stop
>     retval=$?
>     [ $retval -eq 0 ] && rm -f $lockfile
>     return $retval
>@@ -44,7 +64,7 @@ restart() {
> }
> 
> rh_status() {
>-    swift_action "$name" "$subserv" status
>+    swift_action_expirer "$name" "$subserv" status
> }
> 
> rh_status_q() {
>diff --git a/openstack-swift-object-expirer.upstart b/openstack-swift-object-expirer.upstart
>index 23f2cbd..651ef40 100644
>--- a/openstack-swift-object-expirer.upstart
>+++ b/openstack-swift-object-expirer.upstart
>@@ -5,4 +5,4 @@ stop on runlevel [S016]
> 
> respawn
> 
>-exec su -s /bin/sh -c "exec /usr/bin/swift-object-expirer /etc/swift/object-server.conf" swift
>+exec su -s /bin/sh -c "exec /usr/bin/swift-object-expirer /etc/swift/object-expirer.conf" swift
>diff --git a/openstack-swift-object-replicator.init b/openstack-swift-object-replicator.init
>index f4a7a92..29c96c4 100644
>--- a/openstack-swift-object-replicator.init
>+++ b/openstack-swift-object-replicator.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-object
>+# Provides:          openstack-swift-object-replicator
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Object replicator for swift.
> ### END INIT INFO
> 
>-# openstack-swift-object: swift object replicator
>+# openstack-swift-object-replicator: swift object replicator
> #
> # chkconfig: - 98 02
> # description: Object replicator for swift.
>diff --git a/openstack-swift-object-updater.init b/openstack-swift-object-updater.init
>index b55c2db..af1dc5a 100644
>--- a/openstack-swift-object-updater.init
>+++ b/openstack-swift-object-updater.init
>@@ -1,7 +1,7 @@
> #!/bin/sh
> 
> ### BEGIN INIT INFO
>-# Provides:          openstack-swift-object
>+# Provides:          openstack-swift-object-updater
> # Required-Start:    $remote_fs
> # Required-Stop:     $remote_fs
> # Default-Stop:      0 1 6
>@@ -9,7 +9,7 @@
> # Description:       Object updater for swift.
> ### END INIT INFO
> 
>-# openstack-swift-object: swift object updater
>+# openstack-swift-object-updater: swift object updater
> #
> # chkconfig: - 98 02
> # description: Object updater for swift.
>diff --git a/openstack-swift.spec b/openstack-swift.spec
>index adb20a7..95bac82 100644
>--- a/openstack-swift.spec
>+++ b/openstack-swift.spec
>@@ -6,7 +6,7 @@
> 
> Name:             openstack-swift
> Version:          1.7.4
>-Release:          10%{?dist}
>+Release:          10.z2%{?dist}
> Summary:          OpenStack Object Storage (swift)
> 
> Group:            Development/Languages
>@@ -46,6 +46,7 @@ Source513:        %{name}-object-replicator.init
> Source514:        %{name}-object-updater.init
> Source6:          %{name}-proxy.init
> Source61:         proxy-server.conf
>+Source62:         object-expirer.conf
> Source600:        %{name}-proxy.upstart
> Source7:          swift.conf
> 
>@@ -245,6 +246,7 @@ install -p -D -m 660 %{SOURCE22} %{buildroot}%{_sysconfdir}/swift/account-server
> install -p -D -m 660 %{SOURCE42} %{buildroot}%{_sysconfdir}/swift/container-server.conf
> install -p -D -m 660 %{SOURCE52} %{buildroot}%{_sysconfdir}/swift/object-server.conf
> install -p -D -m 660 %{SOURCE61} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf
>+install -p -D -m 660 %{SOURCE62} %{buildroot}%{_sysconfdir}/swift/object-expirer.conf
> install -p -D -m 660 %{SOURCE7} %{buildroot}%{_sysconfdir}/swift/swift.conf
> # Install pid directory
> install -d -m 755 %{buildroot}%{_localstatedir}/run/swift
>@@ -405,6 +407,7 @@ fi
> %{_bindir}/swift-temp-url
> %{python_sitelib}/swift/*.py*
> %{python_sitelib}/swift/common
>+%{python_sitelib}/swift/obj
> %{python_sitelib}/swift-%{version}-*.egg-info
> 
> %files account
>@@ -472,11 +475,10 @@ fi
> %{_bindir}/swift-object-replicator
> %{_bindir}/swift-object-server
> %{_bindir}/swift-object-updater
>-%{python_sitelib}/swift/obj
> 
> %files proxy
> %defattr(-,root,root,-)
>-%doc etc/proxy-server.conf-sample
>+%doc etc/proxy-server.conf-sample etc/object-expirer.conf-sample
> %dir %{_initrddir}/%{name}-object-expirer
> %dir %{_initrddir}/%{name}-proxy
> %{_datadir}/%{name}/%{name}-object-expirer.upstart
>@@ -487,6 +489,7 @@ fi
> %{_mandir}/man1/swift-proxy-server.1*
> %dir %{_sysconfdir}/swift/proxy-server
> %config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/proxy-server.conf
>+%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/object-expirer.conf
> %dir %attr(0755, swift, root) %{_localstatedir}/run/swift/proxy-server
> %{_bindir}/swift-object-expirer
> %{_bindir}/swift-proxy-server
>@@ -497,6 +500,9 @@ fi
> %doc LICENSE doc/build/html
> 
> %changelog
>+* Wed Mar 6 2013 Pete Zaitcev <zaitcev@redhat.com> 1.7.4-10.z2
>+- Help to start the object expirer, bz#916622 (test patch 3)
>+
> * Tue Feb 26 2013 Pete Zaitcev <zaitcev@redhat.com> 1.7.4-10
> - Move swift.1 to python-swiftclient, bz#904353
>

Flags:

apevec: review+
derekh: review+

Actions: View | Diff

Attachments on bug 916622: 704293 | 706212