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

Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 167
Merged at revision: 166
Proposed branch: lp:~james-page/swift/add-object-expirer
Merge into: lp:~ubuntu-server-dev/swift/icehouse
Diff against target: 170 lines (+100/-1)
9 files modified
debian/changelog (+15/-0)
debian/control (+33/-0)
debian/object-expirer.conf (+18/-0)
debian/rules (+2/-0)
debian/swift-container.swift-container-sync.upstart (+15/-0)
debian/swift-object-expirer.docs (+1/-0)
debian/swift-object-expirer.install (+1/-0)
debian/swift-object-expirer.upstart (+15/-0)
debian/swift-object.install (+0/-1)
To merge this branch: bzr merge lp:~james-page/swift/add-object-expirer
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+207883@code.launchpad.net

Description of the change

Add support for install of object-expirer

This is not bundled with swift-object by default.

To post a comment you must log in.
165. By James Page

Revert accidentally landed changes

166. By James Page

Rebase on parent, resolve issues

167. By James Page

Add missing files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-02-24 10:36:52 +0000
3+++ debian/changelog 2014-02-24 10:41:53 +0000
4@@ -1,3 +1,18 @@
5+swift (1.12.0-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Add object-expirer package and associated configuration (LP: #1235495):
8+ - d/control: Add swift-object-expirer package, break/replace swift-object
9+ from earlier versions.
10+ - d/swift-object.install: Drop install of swift-object-expirer.
11+ - d/swift-object-expirer.{install,upstart}: Install swift-object-expirer
12+ and associated upstart configuration.
13+ - d/rules,object-expirer.conf: Provide basic object-expirer configuration.
14+ - debian/swift-object-expirer.docs: Add full example configuration to docs.
15+ * d/rules,swift-container.swift-container-sync.upstart: Add upstart
16+ configuration for swift-container-sync process (LP: #1250171).
17+
18+ -- James Page <james.page@ubuntu.com> Mon, 24 Feb 2014 10:37:20 +0000
19+
20 swift (1.12.0-0ubuntu1) trusty; urgency=medium
21
22 * New upstream release.
23
24=== modified file 'debian/control'
25--- debian/control 2014-02-24 10:36:52 +0000
26+++ debian/control 2014-02-24 10:41:53 +0000
27@@ -138,6 +138,39 @@
28 This package provides a proxy server on which clients can connect to store
29 object into Swift.
30
31+Package: swift-object-expirer
32+Architecture: all
33+Depends:
34+ python-swift (=${binary:Version}),
35+ ${misc:Depends},
36+ ${python:Depends},
37+ ${shlibs:Depends}
38+Provides: ${python:Provides}
39+Breaks: swift-object (<< 1.12.0-0ubuntu2)
40+Replaces: swift-object (<< 1.12.0-0ubuntu2)
41+Description: distributed virtual object store - object expirer
42+ OpenStack Object Storage (code-named Swift) is open source software for
43+ creating redundant, scalable object storage using clusters of standardized
44+ servers to store petabytes of accessible data. It is not a file system or
45+ real-time data storage system, but rather a long-term storage system for a
46+ more permanent type of static data that can be retrieved, leveraged, and then
47+ updated if necessary. Primary examples of data that best fit this type of
48+ storage model are virtual machine images, photo storage, email storage and
49+ backup archiving. Having no central "brain" or master point of control
50+ provides greater scalability, redundancy and permanence.
51+ .
52+ Objects are written to multiple hardware devices in the data center, with
53+ the OpenStack software responsible for ensuring data replication and
54+ integrity across the cluster. Storage clusters can scale horizontally by
55+ adding new nodes. Should a node fail, OpenStack works to replicate its
56+ content from other active nodes. Because OpenStack uses software logic to
57+ ensure data replication and distribution across different devices,
58+ inexpensive commodity hard drives and servers can be used in lieu of more
59+ expensive equipment.
60+ .
61+ This package provides the object-expirer service that provides scheduled
62+ deletion of objects in Swift.
63+
64 Package: swift-object
65 Architecture: all
66 Depends:
67
68=== added file 'debian/object-expirer.conf'
69--- debian/object-expirer.conf 1970-01-01 00:00:00 +0000
70+++ debian/object-expirer.conf 2014-02-24 10:41:53 +0000
71@@ -0,0 +1,18 @@
72+[DEFAULT]
73+
74+[object-expirer]
75+interval = 300
76+
77+[pipeline:main]
78+pipeline = catch_errors cache proxy-server
79+
80+[app:proxy-server]
81+use = egg:swift#proxy
82+
83+[filter:cache]
84+use = egg:swift#memcache
85+
86+[filter:catch_errors]
87+use = egg:swift#catch_errors
88+
89+# See object-expirer.conf-sample for options
90
91=== modified file 'debian/rules'
92--- debian/rules 2014-02-24 10:36:52 +0000
93+++ debian/rules 2014-02-24 10:41:53 +0000
94@@ -30,12 +30,14 @@
95 install -D -m 0640 $(CURDIR)/debian/account-server.conf $(CURDIR)/debian/swift-account/etc/swift/account-server.conf
96 install -D -m 0640 $(CURDIR)/debian/container-server.conf $(CURDIR)/debian/swift-container/etc/swift/container-server.conf
97 install -D -m 0640 $(CURDIR)/debian/object-server.conf $(CURDIR)/debian/swift-object/etc/swift/object-server.conf
98+ install -D -m 0640 $(CURDIR)/debian/object-expirer.conf $(CURDIR)/debian/swift-object-expirer/etc/swift/object-expirer.conf
99
100 override_dh_installinit:
101 dh_installinit --no-start
102 dh_installinit --no-start -pswift-container --name=swift-container-replicator
103 dh_installinit --no-start -pswift-container --name=swift-container-auditor
104 dh_installinit --no-start -pswift-container --name=swift-container-updater
105+ dh_installinit --no-start -pswift-container --name=swift-container-sync
106 dh_installinit --no-start -pswift-account --name=swift-account-replicator
107 dh_installinit --no-start -pswift-account --name=swift-account-auditor
108 dh_installinit --no-start -pswift-account --name=swift-account-reaper
109
110=== added file 'debian/swift-container.swift-container-sync.upstart'
111--- debian/swift-container.swift-container-sync.upstart 1970-01-01 00:00:00 +0000
112+++ debian/swift-container.swift-container-sync.upstart 2014-02-24 10:41:53 +0000
113@@ -0,0 +1,15 @@
114+description "SWIFT Container Sync"
115+author "James Page <james.page@ubuntu.com>"
116+
117+start on runlevel [2345]
118+stop on runlevel [016]
119+
120+pre-start script
121+ if [ -f "/etc/swift/container-server.conf" ]; then
122+ exec /usr/bin/swift-init container-sync start
123+ else
124+ exit 1
125+ fi
126+end script
127+
128+post-stop exec /usr/bin/swift-init container-sync stop
129
130=== added file 'debian/swift-object-expirer.docs'
131--- debian/swift-object-expirer.docs 1970-01-01 00:00:00 +0000
132+++ debian/swift-object-expirer.docs 2014-02-24 10:41:53 +0000
133@@ -0,0 +1,1 @@
134+etc/object-expirer.conf-sample
135
136=== added file 'debian/swift-object-expirer.install'
137--- debian/swift-object-expirer.install 1970-01-01 00:00:00 +0000
138+++ debian/swift-object-expirer.install 2014-02-24 10:41:53 +0000
139@@ -0,0 +1,1 @@
140+usr/bin/swift-object-expirer
141
142=== added file 'debian/swift-object-expirer.upstart'
143--- debian/swift-object-expirer.upstart 1970-01-01 00:00:00 +0000
144+++ debian/swift-object-expirer.upstart 2014-02-24 10:41:53 +0000
145@@ -0,0 +1,15 @@
146+description "SWIFT Object Expirer"
147+author "Will Kelly <william.kelly@rackspace.com>"
148+
149+start on runlevel [2345]
150+stop on runlevel [016]
151+
152+pre-start script
153+ if [ -f "/etc/swift/object-expirer.conf" ]; then
154+ exec /usr/bin/swift-init object-expirer start
155+ else
156+ exit 1
157+ fi
158+end script
159+
160+post-stop exec /usr/bin/swift-init object-expirer stop
161
162=== modified file 'debian/swift-object.install'
163--- debian/swift-object.install 2014-02-24 10:36:52 +0000
164+++ debian/swift-object.install 2014-02-24 10:41:53 +0000
165@@ -1,5 +1,4 @@
166 usr/bin/swift-object-auditor
167-usr/bin/swift-object-expirer
168 usr/bin/swift-object-info
169 usr/bin/swift-object-replicator
170 usr/bin/swift-object-server

Subscribers

People subscribed via source and target branches