Merge lp:~nobuto/charms/trusty/ceph-osd/more-sysctl-default into lp:~openstack-charmers-archive/charms/trusty/ceph-osd/next

[Nobuto Murata]

In bug #1366598, sysctl support and kernel.pid_max=2097152 by default have been implemented. However it turned out that more sysctl default change is needed in some high density deployment, especially vm.max_map_count and kernel.threads-max.

This branch increases more sysctl values by default to allow 256k threads per process
and 2M threads in total.

Test case and results are available in:
https://bugs.launchpad.net/charms/+source/ceph/+bug/1420339/comments/1

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1813 ceph-osd-next for nobuto mp249796
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1813/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2023 ceph-osd-next for nobuto mp249796
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
  I: config.yaml: option key has no default value
  make: *** [lint] Error 100

Full lint test output: http://paste.ubuntu.com/10253142/
Build: http://10.245.162.77:8080/job/charm_lint_check/2023/

[lp:~nobuto/charms/trusty/ceph-osd/more-sysctl-default]

39. By Nobuto Murata on 2015-02-16

update config.yaml description

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1961 ceph-osd-next for nobuto mp249796
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1961/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1816 ceph-osd-next for nobuto mp249796
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1816/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2026 ceph-osd-next for nobuto mp249796
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
  I: config.yaml: option key has no default value
  make: *** [lint] Error 100

Full lint test output: http://paste.ubuntu.com/10253538/
Build: http://10.245.162.77:8080/job/charm_lint_check/2026/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1964 ceph-osd-next for nobuto mp249796
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1964/

[lp:~nobuto/charms/trusty/ceph-osd/more-sysctl-default]

40. By Nobuto Murata on 2015-02-18

fix lint warning

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1890 ceph-osd-next for nobuto mp249796
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1890/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2100 ceph-osd-next for nobuto mp249796
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2100/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2001 ceph-osd-next for nobuto mp249796
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2001/

[Edward Hope-Morley (hopem)]

This patch hopefully aligns these defaults and while it is mostly expected to benefit larger clusters, it is not expected to introduce any performance regressions for smaller clusters. I'll land this and it can sit in /next for a while so that people can use/test it.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-01-16 10:56:36 +0000
+++ config.yaml	2015-02-18 06:47:58 +0000
@@ -123,13 +123,15 @@
       your network interface.
   sysctl:
     type: string
-    default: '{ kernel.pid_max : 2097152 }'
+    default: '{ kernel.pid_max : 2097152, vm.max_map_count : 524288, kernel.threads-max: 2097152 }'
     description: |
       YAML-formatted associative array of sysctl key/value pairs to be set
-      persistently. As a default we set pid_max to a high value to avoid
-      problems with large numbers (>20) of OSDs recovering. very large clusters
-      should set this value even higher (max 4194303).
+      persistently. As a default we set pid_max, max_map_count and 
+      threads-max to a high value to avoid problems with large numbers (>20)
+      of OSDs recovering. very large clusters should set those values even 
+      higher (max 4194303).
   nagios_context:
+    type: string
     default: "juju"
     description: |
       Used by the nrpe-external-master subordinate charm.