Merge lp:~mthaddon/charms/trusty/swift-storage/workers-cpu-scaling into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next
Proposed by
Tom Haddon
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp:~mthaddon/charms/trusty/swift-storage/workers-cpu-scaling |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/swift-storage/next |
Diff against target: |
130 lines (+31/-6) 7 files modified
config.yaml (+14/-1) hooks/swift_storage_context.py (+5/-0) hooks/swift_storage_utils.py (+1/-1) templates/account-server.conf (+1/-1) templates/container-server.conf (+1/-1) templates/object-server.conf (+2/-1) unit_tests/test_swift_storage_context.py (+7/-1) |
To merge this branch: | bzr merge lp:~mthaddon/charms/trusty/swift-storage/workers-cpu-scaling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Needs Fixing | ||
Review via email: mp+223534@code.launchpad.net |
Description of the change
Make the number of workers for account, container and object servers a multiplier of the number of CPUs, and default to a sensible setting per recommendations in http://
To post a comment you must log in.
Hi Tom
Thanks for the MP - looks like a good feature to have.
Right now this branch introduces a test failure:
======= ======= ======= ======= ======= ======= ======= ======= ======= ======= storage_ server_ context (unit_tests. test_swift_ storage_ context. SwiftStorageCon textTests) ------- ------- ------- ------- ------- ------- ------- ------- ------- jamespage/ src/charms/ review/ swift-storage/ unit_tests/ test_swift_ storage_ context. py", line 71, in test_swift_ storage_ server_ context assertEquals( ex, result) server_ port': '502', 'local_ip': '10.0.0.5', 'account_ server_ port': [truncated]... != {'local_ip': '10.0.0.5', 'workers': 4, 'object_ server_ threads_ per_disk' : 4, 'con [truncated]... server_ port': '500', server_ port': '502', server_ port': '501'}
FAIL: test_swift_
-------
Traceback (most recent call last):
File "/home/
self.
AssertionError: {'container_
{'account_
'container_
'local_ip': '10.0.0.5',
- 'object_
? ^
+ 'object_ server_ port': '501',
? ^
+ 'object_ server_ threads_ per_disk' : 4,
+ 'workers': 4}
Please could you fix up - you can run units tests by using 'make test'. You will need to patch out psutils.NUM_CPU's as well in order to make the test deterministic.
Cheers
James