Merge lp:~mthaddon/charms/trusty/swift-storage/connections-and-concurrency into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Tom Haddon]

Add config options for max connections of the account, container and object rsync stanzas, and also add a config option for object replicator concurrency.

[lp:~mthaddon/charms/trusty/swift-storage/connections-and-concurrency]

46. By Tom Haddon on 2014-09-12

Explicitly set rsync config values for better testing

=== modified file 'config.yaml'
--- config.yaml	2014-06-19 08:40:58 +0000
+++ config.yaml	2014-09-12 11:02:38 +0000
@@ -63,3 +63,23 @@
       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.
+  account-max-connections:
+    default: 2
+    type: int
+    description: |
+      Number of connections allowed to the account rsync stanza.
+  container-max-connections:
+    default: 2
+    type: int
+    description: |
+      Number of connections allowed to the container rsync stanza.
+  object-max-connections:
+    default: 2
+    type: int
+    description: |
+      Number of connections allowed to the object rsync stanza.
+  object-replicator-concurrency:
+    default: 1
+    type: int
+    description: |
+      Number of replication workers to spawn.

=== modified file 'hooks/swift_storage_context.py'
--- hooks/swift_storage_context.py	2014-06-18 11:34:19 +0000
+++ hooks/swift_storage_context.py	2014-09-12 11:02:38 +0000
@@ -71,5 +71,10 @@
             'workers': str(psutil.NUM_CPUS * multiplier),
             'object_server_threads_per_disk': config(
                 'object-server-threads-per-disk'),
+            'account_max_connections': config('account-max-connections'),
+            'container_max_connections': config('container-max-connections'),
+            'object_max_connections': config('object-max-connections'),
+            'object_replicator_concurrency': config(
+                'object-replicator-concurrency'),
         }
         return ctxt

=== modified file 'templates/object-server.conf'
--- templates/object-server.conf	2014-06-18 10:48:24 +0000
+++ templates/object-server.conf	2014-09-12 11:02:38 +0000
@@ -15,6 +15,7 @@
 threads_per_disk = {{ object_server_threads_per_disk }}
 
 [object-replicator]
+concurrency = {{ object_replicator_concurrency }}
 
 [object-updater]
 

=== modified file 'templates/rsyncd.conf'
--- templates/rsyncd.conf	2013-07-19 19:52:45 +0000
+++ templates/rsyncd.conf	2014-09-12 11:02:38 +0000
@@ -5,19 +5,19 @@
 address = {{ local_ip }}
 
 [account]
-max connections = 2
+max connections = {{ account_max_connections }}
 path = /srv/node/
 read only = false
 lock file = /var/lock/account.lock
 
 [container]
-max connections = 2
+max connections = {{ container_max_connections }}
 path = /srv/node/
 read only = false
 lock file = /var/lock/container.lock
 
 [object]
-max connections = 2
+max connections = {{ object_max_connections }}
 path = /srv/node/
 read only = false
 lock file = /var/lock/object.lock

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2014-07-11 16:41:12 +0000
+++ tests/basic_deployment.py	2014-09-12 11:02:38 +0000
@@ -383,6 +383,9 @@
                 'use': 'egg:swift#object',
                 'threads_per_disk': '4'
             }
+            'object-replicator': {
+                'concurrency': '1'
+            }
         }
 
         for section, pairs in expected.iteritems():

=== modified file 'unit_tests/test_swift_storage_context.py'
--- unit_tests/test_swift_storage_context.py	2014-06-19 08:40:58 +0000
+++ unit_tests/test_swift_storage_context.py	2014-09-12 11:02:38 +0000
@@ -64,6 +64,10 @@
         self.test_config.set('container-server-port', '502')
         self.test_config.set('object-server-threads-per-disk', '3')
         self.test_config.set('worker-multiplier', '3')
+        self.test_config.set('object-replicator-concurrency', '3')
+        self.test_config.set('account-max-connections', '10')
+        self.test_config.set('container-max-connections', '10')
+        self.test_config.set('object-max-connections', '10')
         num_workers = psutil.NUM_CPUS * 3
         ctxt = swift_context.SwiftStorageServerContext()
         result = ctxt()
@@ -74,5 +78,9 @@
             'local_ip': '10.0.0.5',
             'object_server_threads_per_disk': '3',
             'workers': str(num_workers),
+            'object_replicator_concurrency': '3',
+            'account_max_connections': '10',
+            'container_max_connections': '10',
+            'object_max_connections': '10',
         }
         self.assertEquals(ex, result)