Merge lp:~niedbalski/charm-helpers/lp-1461669 into lp:charm-helpers

[Jorge Niedbalski]

Charm-helpers fix for 1461669

[Felipe Reyes (freyes)]

LGTM, +1

review: Approve

[lp:~niedbalski/charm-helpers/lp-1461669]

383. By Jorge Niedbalski on 2015-06-03

Move log to any size

[Billy Olsen (billy-olsen)]

LGTM. In a separate mp, I propose we set the default value to something a bit smarter than 80% of the total RAM due to the lxc limitations.

review: Approve

[Mario Splivalo (mariosplivalo)]

LGTM too. The default is 50%, although, maybe it would be best to have default of 256M, unless available memory is less than that (then default to 20% of RAM, or something like it)?

review: Approve

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2015-05-06 12:59:16 +0000
+++ charmhelpers/contrib/database/mysql.py	2015-06-03 20:33:05 +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 'tests/contrib/database/test_mysql.py'
--- tests/contrib/database/test_mysql.py	2015-05-06 12:59:16 +0000
+++ tests/contrib/database/test_mysql.py	2015-06-03 20:33:05 +0000
@@ -237,6 +237,40 @@
     @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
     @mock.patch.object(mysql, 'config_get')
     @mock.patch.object(mysql, 'log')
+    def test_parse_config_innodb_buffer_unset(self, mog, config, mem):
+        mem.return_value = "100G"
+        config.return_value = {
+            'innodb-buffer-pool-size': None,
+            'dataset-size': None,
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(
+            mysql_config.get('innodb-buffer-pool-size'),
+            int(helper.human_to_bytes(mem.return_value) *
+                helper.DEFAULT_INNODB_BUFFER_FACTOR))
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
+    def test_parse_config_innodb_dataset_size(self, mog, config, mem):
+        mem.return_value = "100G"
+        config.return_value = {
+            'dataset-size': "10G",
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(
+            mysql_config.get('innodb-buffer-pool-size'),
+            int(helper.human_to_bytes("10G")))
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
     def test_parse_config_wait_timeout(self, mog, config, mem):
         mem.return_value = "100G"