Merge lp:~niedbalski/charm-helpers/fix-1425528 into lp:charm-helpers

[Jorge Niedbalski]

-Fixes LP Bug: #1425528

[Felipe Reyes (freyes)]

Thanks Jorge, LGTM

review: Approve

[lp:~niedbalski/charm-helpers/fix-1425528]

326. By Jorge Niedbalski on 2015-02-25

tuning-level option is not available on the percona-cluster charm

327. By Jorge Niedbalski on 2015-02-25

tuning-level option is not available on the percona-cluster charm

[Mario Splivalo (mariosplivalo)]

I made a mistake here - I overlooked the target and wrongly assumed we are discussing percona-cluster here, I am sorry!

Please see my inline comments.

review: Needs Fixing

[Mario Splivalo (mariosplivalo)]

And wrong again - next time will do review from bzr's qlog, not from launchpad.
This is, indeed, PerconaClusterHelper.

Looks fine to me! Thank you for accepting suggestions.

review: Approve

[lp:~niedbalski/charm-helpers/fix-1425528]

328. By Jorge Niedbalski on 2015-02-26

Adding a warn for "dataset-size" option deprecation

329. By Jorge Niedbalski on 2015-02-26

Adding a warn for "dataset-size" option deprecation

[Jorge Niedbalski (niedbalski)]

Thanks for the reviews.

review: Approve

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2015-02-25 18:42:20 +0000
+++ charmhelpers/contrib/database/mysql.py	2015-02-26 15:29:30 +0000
@@ -289,9 +289,11 @@
 
 class PerconaClusterHelper(object):
 
-    # Going for the biggest page size to avoid wasted bytes. InnoDB page size is
-    # 16MB
+    # Going for the biggest page size to avoid wasted bytes.
+    # InnoDB page size is 16MB
+
     DEFAULT_PAGE_SIZE = 16 * 1024 * 1024
+    DEFAULT_INNODB_BUFFER_FACTOR = 0.50
 
     def human_to_bytes(self, human):
         """Convert human readable configuration options to bytes."""
@@ -352,51 +354,27 @@
         if 'max-connections' in config:
             mysql_config['max_connections'] = config['max-connections']
 
-        # Total memory available for dataset
-        dataset_bytes = self.human_to_bytes(config['dataset-size'])
-        mysql_config['dataset_bytes'] = dataset_bytes
-
-        if 'query-cache-type' in config:
-            # Query Cache Configuration
-            mysql_config['query_cache_size'] = config['query-cache-size']
-            if (config['query-cache-size'] == -1 and
-                    config['query-cache-type'] in ['ON', 'DEMAND']):
-                # Calculate the query cache size automatically
-                qcache_bytes = (dataset_bytes * 0.20)
-                qcache_bytes = int(qcache_bytes -
-                                   (qcache_bytes % self.DEFAULT_PAGE_SIZE))
-                mysql_config['query_cache_size'] = qcache_bytes
-                dataset_bytes -= qcache_bytes
-
-            # 5.5 allows the words, but not 5.1
-            if config['query-cache-type'] == 'ON':
-                mysql_config['query_cache_type'] = 1
-            elif config['query-cache-type'] == 'DEMAND':
-                mysql_config['query_cache_type'] = 2
-            else:
-                mysql_config['query_cache_type'] = 0
-
         # Set a sane default key_buffer size
         mysql_config['key_buffer'] = self.human_to_bytes('32M')
-
-        if 'preferred-storage-engine' in config:
-            # Storage engine configuration
-            preferred_engines = config['preferred-storage-engine'].split(',')
-            chunk_size = int(dataset_bytes / len(preferred_engines))
-            mysql_config['innodb_flush_log_at_trx_commit'] = 1
-            mysql_config['sync_binlog'] = 1
-            if 'InnoDB' in preferred_engines:
-                mysql_config['innodb_buffer_pool_size'] = chunk_size
-                if config['tuning-level'] == 'fast':
-                    mysql_config['innodb_flush_log_at_trx_commit'] = 2
-            else:
-                mysql_config['innodb_buffer_pool_size'] = 0
-
-            mysql_config['default_storage_engine'] = preferred_engines[0]
-            if 'MyISAM' in preferred_engines:
-                mysql_config['key_buffer'] = chunk_size
-
-            if config['tuning-level'] == 'fast':
-                mysql_config['sync_binlog'] = 0
-
+        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")
+
+        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')
+        else:
+            innodb_buffer_pool_size = int(
+                total_memory * self.DEFAULT_INNODB_BUFFER_FACTOR)
+
+        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-02-11 21:41:57 +0000
+++ tests/contrib/database/test_mysql.py	2015-02-26 15:29:30 +0000
@@ -53,3 +53,39 @@
 
         helper.grant_exists.assert_has_calls(calls)
         self.assertEqual(units, set(['unit/0', 'unit/1', 'unit/2']))
+
+
+class PerconaTests(unittest.TestCase):
+
+    def setUp(self):
+        super(PerconaTests, self).setUp()
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    def test_parse_config_innodb_pool_fixed(self, config, mem):
+        mem.return_value = "100G"
+        config.return_value = {
+            'innodb-buffer-pool-size': "50%",
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(mysql_config.get('innodb_buffer_pool_size'),
+                         helper.human_to_bytes("50G"))
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    def test_parse_config_innodb_pool_not_set(self, config, mem):
+        mem.return_value = "100G"
+        config.return_value = {
+            'innodb-buffer-pool-size': '',
+        }
+
+        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))