Merge lp:~letterj/swift/defaultbacklog into lp:~hudson-openstack/swift/trunk

[Jay Payne]

Added default backlog setting to the sample config file

[clayg (clay-gerrard)]

Of little consequence; there's some debate on proper placement of the backlog setting in the config. Does it belong in the app section? Or should it be in the default section next to the other socket related options - bind_ip and bind_port?

After some discussion, it seems that the "bind_port" is used by the replicator to determine which devices in the ring it's responsible for replicating. In many cases comparing the 'ip' of the device in the ring to the ips configured on the system running the replicator (see common.util.whataremyips) is enough for the replicator to "claim" a device - but not always (e.g. saio) - so the bind_port in the config is used as final verification key.

To keep things less weird looking it seems a few other app/server config options were moved into default section as well (i.e. bind_ip and workers - which are all used in run_wsgi around the same time as bind_port) - although I can't see where any of them besides bind_port are used in any other module classes.

IMHO, all the socket and run_wsgi related config options should probably be kept together in the default section of the config instead of the app/server section - but my only justification is keeping with the convention of "less weird looking".

If there's time, it may be nice to try and track down some other "config option easter eggs" that could added to the conf-sample's (e.g. object-replicator.ring_check_interval) and some defaults that don't match the configs (e.g. object-replicator.timeout)

review: Needs Fixing

[lp:~letterj/swift/defaultbacklog]

94. By Jay Payne on 2010-10-13

Moved backlog setting into the [Default] section of the sample-conf files

[Chuck Thier (cthier)]

Looks good for now, and suffices for this bug report. Clayg, would you mind making bug reports for the other config cleanup stuff, as those should be done at some point, but not with this branch.

review: Approve

[clayg (clay-gerrard)]

Sure thing Chuck!

https://bugs.launchpad.net/swift/+bug/661267

=== modified file 'etc/account-server.conf-sample'
--- etc/account-server.conf-sample	2010-08-24 14:10:36 +0000
+++ etc/account-server.conf-sample	2010-10-14 00:15:56 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 # bind_ip = 0.0.0.0
 # bind_port = 6002
+# backlog = 4096
 # workers = 1
 # user = swift
 # swift_dir = /etc/swift

=== modified file 'etc/container-server.conf-sample'
--- etc/container-server.conf-sample	2010-08-24 14:10:36 +0000
+++ etc/container-server.conf-sample	2010-10-14 00:15:56 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 # bind_ip = 0.0.0.0
 # bind_port = 6001
+# backlog = 4096
 # workers = 1
 # user = swift
 # swift_dir = /etc/swift

=== modified file 'etc/object-server.conf-sample'
--- etc/object-server.conf-sample	2010-08-24 14:10:36 +0000
+++ etc/object-server.conf-sample	2010-10-14 00:15:56 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 # bind_ip = 0.0.0.0
 # bind_port = 6000
+# backlog = 4096
 # workers = 1
 # user = swift
 # swift_dir = /etc/swift

=== modified file 'etc/proxy-server.conf-sample'
--- etc/proxy-server.conf-sample	2010-09-09 17:24:25 +0000
+++ etc/proxy-server.conf-sample	2010-10-14 00:15:56 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 # bind_ip = 0.0.0.0
 # bind_port = 80
+# backlog = 4096
 # swift_dir = /etc/swift
 # workers = 1
 # user = swift