equal
deleted
inserted
replaced
1 This patch sets the default value of the number of "workers" in the |
1 This patch sets the default value of the number of "workers" in the |
2 Swift configuration files for a single CPU system. The default based on |
2 Swift configuration files for a single CPU system. The default based on |
3 the number of CPUs (cores) found may not be efficient on a system with |
3 the number of CPUs (cores) found may not be efficient on a system with |
4 a large number of cores. This patch is not suitable for the upstream. |
4 a large number of cores. This patch is not suitable for the upstream. |
5 |
5 |
6 --- swift-2.2.2/etc/account-server.conf-sample.~2~ 2015-03-03 13:32:49.269716798 -0800 |
6 --- swift-2.3.0/etc/account-server.conf-sample.~2~ 2016-02-08 00:02:16.969218591 -0800 |
7 +++ swift-2.2.2/etc/account-server.conf-sample 2015-03-03 13:32:49.300905746 -0800 |
7 +++ swift-2.3.0/etc/account-server.conf-sample 2016-02-08 00:02:17.037019168 -0800 |
8 @@ -10,8 +10,9 @@ bind_port = 6002 |
8 @@ -10,8 +10,9 @@ bind_port = 6002 |
9 # disable_fallocate = false |
9 # disable_fallocate = false |
10 # |
10 # |
11 # Use an integer to override the number of pre-forked processes that will |
11 # Use an integer to override the number of pre-forked processes that will |
12 -# accept connections. |
12 -# accept connections. |
15 +# cores in the system. |
15 +# cores in the system. |
16 +workers = 1 |
16 +workers = 1 |
17 # |
17 # |
18 # Maximum concurrent requests per worker |
18 # Maximum concurrent requests per worker |
19 # max_clients = 1024 |
19 # max_clients = 1024 |
20 --- swift-2.2.2/etc/container-server.conf-sample.~2~ 2015-03-03 13:32:49.269950594 -0800 |
20 --- swift-2.3.0/etc/container-server.conf-sample.~2~ 2016-02-08 00:02:16.969741046 -0800 |
21 +++ swift-2.2.2/etc/container-server.conf-sample 2015-03-03 13:32:49.301151407 -0800 |
21 +++ swift-2.3.0/etc/container-server.conf-sample 2016-02-08 00:02:17.037565309 -0800 |
22 @@ -10,8 +10,9 @@ bind_port = 6001 |
22 @@ -10,8 +10,9 @@ bind_port = 6001 |
23 # disable_fallocate = false |
23 # disable_fallocate = false |
24 # |
24 # |
25 # Use an integer to override the number of pre-forked processes that will |
25 # Use an integer to override the number of pre-forked processes that will |
26 -# accept connections. |
26 -# accept connections. |
29 +# cores in the system. |
29 +# cores in the system. |
30 +workers = 1 |
30 +workers = 1 |
31 # |
31 # |
32 # Maximum concurrent requests per worker |
32 # Maximum concurrent requests per worker |
33 # max_clients = 1024 |
33 # max_clients = 1024 |
34 --- swift-2.2.2/etc/object-server.conf-sample.~2~ 2015-03-03 13:32:49.270540923 -0800 |
34 --- swift-2.3.0/etc/object-server.conf-sample.~2~ 2016-02-08 00:02:16.971225158 -0800 |
35 +++ swift-2.2.2/etc/object-server.conf-sample 2015-03-03 13:32:49.301367390 -0800 |
35 +++ swift-2.3.0/etc/object-server.conf-sample 2016-02-08 00:02:17.038057162 -0800 |
36 @@ -12,8 +12,9 @@ bind_port = 6000 |
36 @@ -12,8 +12,9 @@ bind_port = 6000 |
37 # expiring_objects_account_name = expiring_objects |
37 # expiring_objects_account_name = expiring_objects |
38 # |
38 # |
39 # Use an integer to override the number of pre-forked processes that will |
39 # Use an integer to override the number of pre-forked processes that will |
40 -# accept connections. |
40 -# accept connections. |
43 +# cores in the system. |
43 +# cores in the system. |
44 +workers = 1 |
44 +workers = 1 |
45 # |
45 # |
46 # Maximum concurrent requests per worker |
46 # Maximum concurrent requests per worker |
47 # max_clients = 1024 |
47 # max_clients = 1024 |
48 --- swift-2.2.2/etc/proxy-server.conf-sample.~1~ 2015-02-01 23:44:14.000000000 -0800 |
48 --- swift-2.3.0/etc/proxy-server.conf-sample.~1~ 2015-04-30 06:57:42.000000000 -0700 |
49 +++ swift-2.2.2/etc/proxy-server.conf-sample 2015-03-03 13:32:49.301633168 -0800 |
49 +++ swift-2.3.0/etc/proxy-server.conf-sample 2016-02-08 00:02:17.038685067 -0800 |
50 @@ -22,10 +22,10 @@ bind_port = 8080 |
50 @@ -23,10 +23,10 @@ bind_port = 8080 |
51 # disallowed_sections = container_quotas, tempurl, bulk_delete.max_failed_deletes |
51 # disallowed_sections = swift.valid_api_versions, container_quotas, tempurl |
52 |
52 |
53 # Use an integer to override the number of pre-forked processes that will |
53 # Use an integer to override the number of pre-forked processes that will |
54 -# accept connections. Should default to the number of effective cpu |
54 -# accept connections. Should default to the number of effective cpu |
55 +# accept connections. Use "auto" or default for the number of effective cpu |
55 +# accept connections. Use "auto" or default for the number of effective cpu |
56 # cores in the system. It's worth noting that individual workers will |
56 # cores in the system. It's worth noting that individual workers will |