Merge lp:~mthaddon/charms/trusty/swift-storage/workers-threads-per-disk into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk

[Tom Haddon]

Same change as proposed for precise at https://code.launchpad.net/~mthaddon/charms/precise/swift-storage/workers-threads-per-disk/+merge/223026

[Tom Haddon (mthaddon)]

Taking a different approach

Unmerged revisions

28. By Tom Haddon on 2014-06-13

Merge to trusty

=== modified file 'config.yaml'
--- config.yaml	2012-12-19 23:09:13 +0000
+++ config.yaml	2014-06-13 13:15:29 +0000
@@ -49,4 +49,24 @@
     default: 6002
     type: int
     description: Listening port of the swift-account-server.
-
+  object-server-workers:
+    default: 2
+    type: int
+    description: Number of workers of the swift-object-server.
+  container-server-workers:
+    default: 2
+    type: int
+    description: Number of workers of the swift-container-server.
+  account-server-workers:
+    default: 2
+    type: int
+    description: Number of workers of the swift-account-server.
+  object-server-threads-per-disk:
+    default: 0
+    type: int
+    description: |
+        Size of the per-disk thread pool used for performing disk I/O. The
+        default of 0 means to not use a per-disk thread pool. It is 
+        recommended to keep this value small, as large values can result in 
+        high read latencies due to large queue depths. A good starting point 
+        is 4 threads per disk.
 
=== modified file 'hooks/swift_storage_context.py'
--- hooks/swift_storage_context.py	2013-08-16 20:38:32 +0000
+++ hooks/swift_storage_context.py	2014-06-13 13:15:29 +0000
@@ -66,5 +66,10 @@
             'account_server_port': config('account-server-port'),
             'container_server_port': config('container-server-port'),
             'object_server_port': config('object-server-port'),
+            'account_server_workers': config('account-server-workers'),
+            'container_server_workers': config('container-server-workers'),
+            'object_server_workers': config('object-server-workers'),
+            'object_server_threads_per_disk': config(
+                'object-server-threads-per-disk'),
         }
         return ctxt
 
=== modified file 'templates/account-server.conf'
--- templates/account-server.conf	2013-09-30 13:29:32 +0000
+++ templates/account-server.conf	2014-06-13 13:15:29 +0000
@@ -1,7 +1,7 @@
 [DEFAULT]
 bind_ip = 0.0.0.0
 bind_port = {{ account_server_port }}
-workers = 2
+workers = {{ account_server_workers }}
 
 [pipeline:main]
 pipeline = recon account-server
 
=== modified file 'templates/container-server.conf'
--- templates/container-server.conf	2014-04-02 12:49:56 +0000
+++ templates/container-server.conf	2014-06-13 13:15:29 +0000
@@ -1,7 +1,7 @@
 [DEFAULT]
 bind_ip = 0.0.0.0
 bind_port = {{ container_server_port }}
-workers = 2
+workers = {{ container_server_workers }}
 
 [pipeline:main]
 pipeline = recon container-server
 
=== modified file 'templates/object-server.conf'
--- templates/object-server.conf	2013-09-30 13:29:32 +0000
+++ templates/object-server.conf	2014-06-13 13:15:29 +0000
@@ -1,7 +1,7 @@
 [DEFAULT]
 bind_ip = 0.0.0.0
 bind_port = {{ object_server_port }}
-workers = 2
+workers = {{ object_server_workers }}
 
 [pipeline:main]
 pipeline = recon object-server
@@ -12,6 +12,7 @@
 
 [app:object-server]
 use = egg:swift#object
+threads_per_disk = {{ object_server_threads_per_disk }}
 
 [object-replicator]