Merge lp:~james-page/charms/precise/rabbitmq-server/ulimit-increase into lp:charms/rabbitmq-server

Proposed by James Page on 2014-05-21
Status: Merged
Merged at revision: 56
Proposed branch: lp:~james-page/charms/precise/rabbitmq-server/ulimit-increase
Merge into: lp:charms/rabbitmq-server
Diff against target: 21 lines (+5/-1)
2 files modified
hooks/rabbitmq_server_relations.py (+2/-1)
templates/rabbitmq-server (+3/-0)
To merge this branch: bzr merge lp:~james-page/charms/precise/rabbitmq-server/ulimit-increase
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Needs Information on 2014-06-11
Charles Butler (community) 2014-05-21 Approve on 2014-06-11
Review via email: mp+220434@code.launchpad.net

Description of the change

Increase default ulimit to something more scalable.

This can be pushed to the trusty charm branch as well.

To post a comment you must log in.
55. By James Page on 2014-05-21

Tune heartbeat

56. By James Page on 2014-05-23

Backout heartbeat changes

Charles Butler (lazypower) wrote :

+1 LGTM

Thanks for the submission!

review: Approve
Charles Butler (lazypower) wrote :

Pushed to both precise/trusty.

Jorge Niedbalski (niedbalski) wrote :

Hello James,

Please review https://code.launchpad.net/~niedbalski/charms/precise/rabbitmq-server/ulimit-increase/+merge/222868

I think using /etc/security/limits.d/ would be a better option for this change.

Let me know your impression.

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/rabbitmq_server_relations.py'
2--- hooks/rabbitmq_server_relations.py 2014-05-02 14:18:00 +0000
3+++ hooks/rabbitmq_server_relations.py 2014-05-23 08:13:18 +0000
4@@ -515,7 +515,8 @@
5 # Add archive source if provided
6 add_source(config('source'), config('key'))
7 apt_update(fatal=True)
8-
9+ # Copy in defaults file for updated ulimits
10+ shutil.copyfile('templates/rabbitmq-server', '/etc/default/rabbitmq-server')
11 # Install packages to ensure any changes to source
12 # result in an upgrade if applicable.
13 apt_install(rabbit.PACKAGES, fatal=True)
14
15=== added file 'templates/rabbitmq-server'
16--- templates/rabbitmq-server 1970-01-01 00:00:00 +0000
17+++ templates/rabbitmq-server 2014-05-23 08:13:18 +0000
18@@ -0,0 +1,3 @@
19+# Generated by juju
20+# bump ulimit so rabbit can support lots of connections
21+ulimit -n 65536

Subscribers

People subscribed via source and target branches