Launchpad itself

Merge ~cjwatson/launchpad:buildd-manager-bump-open-files into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. buildd-manager-bump-open-files
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 6e57786d266f933336ecd0994c102ca8ae81acae
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:buildd-manager-bump-open-files
Merge into: launchpad:master
Diff against target: 17 lines (+4/-3)
1 file modified
daemons/buildd-manager.tac (+4/-3)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+450646@code.launchpad.net

Commit message

Bump buildd-manager open file limit some more

Description of the change

We're bumping into the current limit on production, and I think it's because a few things have changed since we last set that limit: we have more active builders, and we make a few more outgoing connections than we did then (particularly to issue tokens for private builds). Make the limit more generous.

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Makes sense

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/daemons/buildd-manager.tac b/daemons/buildd-manager.tac
2index 876ecae..8fa2bac 100644
3--- a/daemons/buildd-manager.tac
4+++ b/daemons/buildd-manager.tac
5@@ -31,9 +31,10 @@ setup_feature_controller("buildd-manager")
6 # ampoule uses five file descriptors per subprocess (i.e.
7 # 5 * config.builddmaster.download_connections); we also need at least three
8 # per active builder for resuming virtualized builders or making XML-RPC
9-# calls, and we also need to allow slack for odds and ends like database
10-# connections.
11-soft_nofile = 5 * config.builddmaster.download_connections + 2048
12+# calls, we need to be able to make connections from time to time to the
13+# keyserver for fetching keys or to the appserver for issuing macaroons, and
14+# we also need to allow slack for odds and ends like database connections.
15+soft_nofile = 5 * config.builddmaster.download_connections + 4096
16 _, hard_nofile = resource.getrlimit(resource.RLIMIT_NOFILE)
17 resource.setrlimit(resource.RLIMIT_NOFILE, (soft_nofile, hard_nofile))
18

Subscribers

People subscribed via source and target branches

to status/vote changes: