Merge lp:~james-page/swift/add-object-expirer into lp:~ubuntu-server-dev/swift/icehouse

[James Page]

Add support for install of object-expirer

This is not bundled with swift-object by default.

[lp:~james-page/swift/add-object-expirer]

165. By James Page on 2014-02-24

Revert accidentally landed changes

166. By James Page on 2014-02-24

Rebase on parent, resolve issues

167. By James Page on 2014-02-24

Add missing files

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-24 10:36:52 +0000
+++ debian/changelog	2014-02-24 10:41:53 +0000
@@ -1,3 +1,18 @@
+swift (1.12.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add object-expirer package and associated configuration (LP: #1235495):
+    - d/control: Add swift-object-expirer package, break/replace swift-object
+      from earlier versions.
+    - d/swift-object.install: Drop install of swift-object-expirer.
+    - d/swift-object-expirer.{install,upstart}: Install swift-object-expirer
+      and associated upstart configuration.
+    - d/rules,object-expirer.conf: Provide basic object-expirer configuration.
+    - debian/swift-object-expirer.docs: Add full example configuration to docs.
+  * d/rules,swift-container.swift-container-sync.upstart: Add upstart
+    configuration for swift-container-sync process (LP: #1250171).
+
+ -- James Page <[e-mail]>  Mon, 24 Feb 2014 10:37:20 +0000
+
 swift (1.12.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2014-02-24 10:36:52 +0000
+++ debian/control	2014-02-24 10:41:53 +0000
@@ -138,6 +138,39 @@
  This package provides a proxy server on which clients can connect to store
  object into Swift.
 
+Package: swift-object-expirer
+Architecture: all
+Depends:
+ python-swift (=${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Provides: ${python:Provides}
+Breaks: swift-object (<< 1.12.0-0ubuntu2)
+Replaces: swift-object (<< 1.12.0-0ubuntu2)
+Description: distributed virtual object store - object expirer
+ OpenStack Object Storage (code-named Swift) is open source software for
+ creating redundant, scalable object storage using clusters of standardized
+ servers to store petabytes of accessible data. It is not a file system or
+ real-time data storage system, but rather a long-term storage system for a
+ more permanent type of static data that can be retrieved, leveraged, and then
+ updated if necessary. Primary examples of data that best fit this type of
+ storage model are virtual machine images, photo storage, email storage and
+ backup archiving. Having no central "brain" or master point of control
+ provides greater scalability, redundancy and permanence.
+ .
+ Objects are written to multiple hardware devices in the data center, with
+ the OpenStack software responsible for ensuring data replication and
+ integrity across the cluster. Storage clusters can scale horizontally by
+ adding new nodes. Should a node fail, OpenStack works to replicate its
+ content from other active nodes. Because OpenStack uses software logic to
+ ensure data replication and distribution across different devices,
+ inexpensive commodity hard drives and servers can be used in lieu of more
+ expensive equipment.
+ .
+ This package provides the object-expirer service that provides scheduled
+ deletion of objects in Swift.
+
 Package: swift-object
 Architecture: all
 Depends:
 
=== added file 'debian/object-expirer.conf'
--- debian/object-expirer.conf	1970-01-01 00:00:00 +0000
+++ debian/object-expirer.conf	2014-02-24 10:41:53 +0000
@@ -0,0 +1,18 @@
+[DEFAULT]
+
+[object-expirer]
+interval = 300
+
+[pipeline:main]
+pipeline = catch_errors cache proxy-server
+
+[app:proxy-server]
+use = egg:swift#proxy
+
+[filter:cache]
+use = egg:swift#memcache
+
+[filter:catch_errors]
+use = egg:swift#catch_errors
+
+# See object-expirer.conf-sample for options
 
=== modified file 'debian/rules'
--- debian/rules	2014-02-24 10:36:52 +0000
+++ debian/rules	2014-02-24 10:41:53 +0000
@@ -30,12 +30,14 @@
 	install -D -m 0640 $(CURDIR)/debian/account-server.conf $(CURDIR)/debian/swift-account/etc/swift/account-server.conf
 	install -D -m 0640 $(CURDIR)/debian/container-server.conf $(CURDIR)/debian/swift-container/etc/swift/container-server.conf
 	install -D -m 0640 $(CURDIR)/debian/object-server.conf $(CURDIR)/debian/swift-object/etc/swift/object-server.conf
+	install -D -m 0640 $(CURDIR)/debian/object-expirer.conf $(CURDIR)/debian/swift-object-expirer/etc/swift/object-expirer.conf
 
 override_dh_installinit:
 	dh_installinit --no-start
 	dh_installinit --no-start -pswift-container --name=swift-container-replicator
 	dh_installinit --no-start -pswift-container --name=swift-container-auditor
 	dh_installinit --no-start -pswift-container --name=swift-container-updater
+	dh_installinit --no-start -pswift-container --name=swift-container-sync
 	dh_installinit --no-start -pswift-account --name=swift-account-replicator
 	dh_installinit --no-start -pswift-account --name=swift-account-auditor
 	dh_installinit --no-start -pswift-account --name=swift-account-reaper
 
=== added file 'debian/swift-container.swift-container-sync.upstart'
--- debian/swift-container.swift-container-sync.upstart	1970-01-01 00:00:00 +0000
+++ debian/swift-container.swift-container-sync.upstart	2014-02-24 10:41:53 +0000
@@ -0,0 +1,15 @@
+description     "SWIFT Container Sync"
+author          "James Page <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+pre-start script
+  if [ -f "/etc/swift/container-server.conf" ]; then
+    exec /usr/bin/swift-init container-sync start
+  else
+    exit 1
+  fi
+end script
+
+post-stop exec /usr/bin/swift-init container-sync stop
 
=== added file 'debian/swift-object-expirer.docs'
--- debian/swift-object-expirer.docs	1970-01-01 00:00:00 +0000
+++ debian/swift-object-expirer.docs	2014-02-24 10:41:53 +0000
@@ -0,0 +1,1 @@
+etc/object-expirer.conf-sample
 
=== added file 'debian/swift-object-expirer.install'
--- debian/swift-object-expirer.install	1970-01-01 00:00:00 +0000
+++ debian/swift-object-expirer.install	2014-02-24 10:41:53 +0000
@@ -0,0 +1,1 @@
+usr/bin/swift-object-expirer
 
=== added file 'debian/swift-object-expirer.upstart'
--- debian/swift-object-expirer.upstart	1970-01-01 00:00:00 +0000
+++ debian/swift-object-expirer.upstart	2014-02-24 10:41:53 +0000
@@ -0,0 +1,15 @@
+description "SWIFT Object Expirer"
+author "Will Kelly <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+pre-start script
+  if [ -f "/etc/swift/object-expirer.conf" ]; then
+    exec /usr/bin/swift-init object-expirer start
+  else
+    exit 1
+  fi
+end script
+
+post-stop exec /usr/bin/swift-init object-expirer stop
 
=== modified file 'debian/swift-object.install'
--- debian/swift-object.install	2014-02-24 10:36:52 +0000
+++ debian/swift-object.install	2014-02-24 10:41:53 +0000
@@ -1,5 +1,4 @@
 usr/bin/swift-object-auditor
-usr/bin/swift-object-expirer
 usr/bin/swift-object-info
 usr/bin/swift-object-replicator
 usr/bin/swift-object-server