author | Laszlo Peter <laszlo.peter@oracle.com> |
Wed, 07 Sep 2016 14:48:42 -0700 | |
changeset 6853 | cf1567491b1b |
parent 5448 | 56f4540f741d |
permissions | -rw-r--r-- |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
This patch sets the default value of the number of "workers" in the |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
Swift configuration files for a single CPU system. The default based on |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
the number of CPUs (cores) found may not be efficient on a system with |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
a large number of cores. This patch is not suitable for the upstream. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
6 |
--- swift-2.7.0/etc/account-server.conf-sample.~2~ 2016-08-08 19:02:28.015815430 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
7 |
+++ swift-2.7.0/etc/account-server.conf-sample 2016-08-08 19:02:28.090297810 -0700 |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
@@ -10,8 +10,9 @@ bind_port = 6002 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
# disable_fallocate = false |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
# Use an integer to override the number of pre-forked processes that will |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
-# accept connections. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
-# workers = auto |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
+# accept connections. Use "auto" or default for the number of effective cpu |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
+# cores in the system. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
+workers = 1 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
# Maximum concurrent requests per worker |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
# max_clients = 1024 |
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
20 |
--- swift-2.7.0/etc/container-server.conf-sample.~2~ 2016-08-08 19:02:28.016881720 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
21 |
+++ swift-2.7.0/etc/container-server.conf-sample 2016-08-08 19:02:28.090842415 -0700 |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
@@ -10,8 +10,9 @@ bind_port = 6001 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
# disable_fallocate = false |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
# Use an integer to override the number of pre-forked processes that will |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
-# accept connections. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
-# workers = auto |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
+# accept connections. Use "auto" or default for the number of effective cpu |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
+# cores in the system. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
+workers = 1 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
# Maximum concurrent requests per worker |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
33 |
# max_clients = 1024 |
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
34 |
--- swift-2.7.0/etc/object-server.conf-sample.~2~ 2016-08-08 19:02:28.018004470 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
35 |
+++ swift-2.7.0/etc/object-server.conf-sample 2016-08-08 19:02:28.091373715 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
36 |
@@ -12,9 +12,10 @@ bind_port = 6000 |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
37 |
# expiring_objects_account_name = expiring_objects |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
38 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
39 |
# Use an integer to override the number of pre-forked processes that will |
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
40 |
-# accept connections. NOTE: if servers_per_port is set, this setting is |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
41 |
+# accept connections. Use "auto" or default for the number of effective cpu |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
42 |
+# cores in the system. NOTE: if servers_per_port is set, this setting is |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
43 |
# ignored. |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
44 |
-# workers = auto |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
45 |
+workers = 1 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
46 |
# |
6853
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
47 |
# Make object-server run this many worker processes per unique port of |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
48 |
# "local" ring devices across all storage policies. This can help provide |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
49 |
--- swift-2.7.0/etc/proxy-server.conf-sample.~1~ 2016-03-25 02:42:55.000000000 -0700 |
cf1567491b1b
24465859 Update Swift for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5448
diff
changeset
|
50 |
+++ swift-2.7.0/etc/proxy-server.conf-sample 2016-08-08 19:39:35.918794285 -0700 |
5448
56f4540f741d
22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents:
3998
diff
changeset
|
51 |
@@ -23,10 +23,10 @@ bind_port = 8080 |
56f4540f741d
22694904 Some of the OpenStack patches can be cleaned up
david.comay@oracle.com
parents:
3998
diff
changeset
|
52 |
# disallowed_sections = swift.valid_api_versions, container_quotas, tempurl |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
53 |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
54 |
# Use an integer to override the number of pre-forked processes that will |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
55 |
-# accept connections. Should default to the number of effective cpu |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
56 |
+# accept connections. Use "auto" or default for the number of effective cpu |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
57 |
# cores in the system. It's worth noting that individual workers will |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
58 |
# use many eventlet co-routines to service multiple concurrent requests. |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
59 |
-# workers = auto |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
60 |
+workers = 1 |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
61 |
# |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
62 |
# Maximum concurrent requests per worker |
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
63 |
# max_clients = 1024 |