Merge lp:~niedbalski/charms/trusty/percona-cluster/fix-lp1461669 into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Jorge Niedbalski]

Fixes LP bug: #1461669

[Felipe Reyes (freyes)]

Hi Jorge, just a minor comment, the rest LGTM.

review: Needs Fixing

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

charm_unit_test #4736 percona-cluster-next for niedbalski mp261092
    UNIT OK: passed

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

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

charm_lint_check #5057 percona-cluster-next for niedbalski mp261092
    LINT OK: passed

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

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

charm_amulet_test #4464 percona-cluster-next for niedbalski mp261092
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/11567355/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4464/

[lp:~niedbalski/charms/trusty/percona-cluster/fix-lp1461669]

64. By Jorge Niedbalski on 2015-06-04

Addressed @freyes comment

[Felipe Reyes (freyes)]

Thanks Jorge, LGTM

review: Approve

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

charm_unit_test #4737 percona-cluster-next for niedbalski mp261092
    UNIT OK: passed

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

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

charm_lint_check #5058 percona-cluster-next for niedbalski mp261092
    LINT OK: passed

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

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

charm_amulet_test #4465 percona-cluster-next for niedbalski mp261092
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/11567908/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4465/

[Billy Olsen (billy-olsen)]

LGTM Approved. Thanks for the submission Jorge!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-04-21 09:29:08 +0000
+++ config.yaml	2015-06-04 15:11:49 +0000
@@ -10,9 +10,9 @@
       Key ID to import to the apt keyring to support use with arbitary source
       configuration from outside of Launchpad archives or PPA's.
   dataset-size:
-    default: '80%'
+    default:
     type: string
-    description: How much data do you want to keep in memory in the DB. This will be used to tune settings in the database server appropriately. Suffix this value with 'K','M','G', or 'T' to get the relevant kilo/mega/etc. bytes. If suffixed with %, one will get that percentage of RAM devoted to dataset.
+    description: (deprecated) How much data do you want to keep in memory in the DB. This will be used to tune settings in the database server appropriately. Suffix this value with 'K','M','G', or 'T' to get the relevant kilo/mega/etc. bytes. If suffixed with %, one will get that percentage of RAM devoted to dataset.
   max-connections:
     default: -1
     type: int
@@ -103,3 +103,11 @@
     description: |
         A comma-separated list of nagios servicegroups.
         If left empty, the nagios_context will be used as the servicegroup
+  innodb-buffer-pool-size:
+    default:
+    type: string
+    description: |
+      By default this value will be set according to the 50% of system total memory
+      but also can be set to any specific value for the system.
+      Suffix this value with 'K','M','G', or 'T' to get the relevant kilo/mega/etc. bytes.
+      If suffixed with %, one will get that percentage of system total memory devoted.

=== modified file 'hooks/charmhelpers/contrib/database/mysql.py'
--- hooks/charmhelpers/contrib/database/mysql.py	2015-05-13 10:21:30 +0000
+++ hooks/charmhelpers/contrib/database/mysql.py	2015-06-04 15:11:49 +0000
@@ -385,23 +385,25 @@
         mysql_config['key_buffer'] = self.human_to_bytes('32M')
         total_memory = self.human_to_bytes(self.get_mem_total())
 
-        log("Option 'dataset-size' has been deprecated, instead by default %d%% of system \
-        available RAM will be used for innodb_buffer_pool_size allocation" %
-            (self.DEFAULT_INNODB_BUFFER_FACTOR * 100), level="WARN")
-
+        dataset_bytes = config.get('dataset-size', None)
         innodb_buffer_pool_size = config.get('innodb-buffer-pool-size', None)
 
         if innodb_buffer_pool_size:
             innodb_buffer_pool_size = self.human_to_bytes(
                 innodb_buffer_pool_size)
-
-            if innodb_buffer_pool_size > total_memory:
-                log("innodb_buffer_pool_size; {} is greater than system available memory:{}".format(
-                    innodb_buffer_pool_size,
-                    total_memory), level='WARN')
+        elif dataset_bytes:
+            log("Option 'dataset-size' has been deprecated, please use"
+                "innodb_buffer_pool_size option instead", level="WARN")
+            innodb_buffer_pool_size = self.human_to_bytes(
+                dataset_bytes)
         else:
             innodb_buffer_pool_size = int(
                 total_memory * self.DEFAULT_INNODB_BUFFER_FACTOR)
 
+        if innodb_buffer_pool_size > total_memory:
+            log("innodb_buffer_pool_size; {} is greater than system available memory:{}".format(
+                innodb_buffer_pool_size,
+                total_memory), level='WARN')
+
         mysql_config['innodb_buffer_pool_size'] = innodb_buffer_pool_size
         return mysql_config

=== modified file 'templates/my.cnf'
--- templates/my.cnf	2015-04-20 10:53:43 +0000
+++ templates/my.cnf	2015-06-04 15:11:49 +0000
@@ -72,7 +72,7 @@
 
 # InnoDB buffer should consume 100% of the bytes of the dataset size
 # query cache is not supported with Active/Active configuration
-innodb_buffer_pool_size = {{ dataset_bytes }}
+innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
 
 {% if ipv6 -%}
 [sst]