Merge lp:~james-page/charm-helpers/percona-tuning-level into lp:charm-helpers

[James Page]

Add parsing of tuning-level configuration option if detected.

[lp:~james-page/charm-helpers/percona-tuning-level]

702. By James Page on 2017-03-02

Add other innodb config options and associated unit tests

[Charles Butler (lazypower)]

+1 LGTM

I see there are passing tests using this branch here: https://review.openstack.org/#/c/440333

and a big +1 to having tests with the branch. Thanks for the contribution

review: Approve

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2017-02-28 12:04:36 +0000
+++ charmhelpers/contrib/database/mysql.py	2017-03-02 11:55:48 +0000
@@ -336,6 +336,21 @@
     DEFAULT_INNODB_BUFFER_FACTOR = 0.50
     DEFAULT_INNODB_BUFFER_SIZE_MAX = 512 * 1024 * 1024
 
+    # Validation and lookups for InnoDB configuration
+    INNODB_VALID_BUFFERING_VALUES = [
+        'none',
+        'inserts',
+        'deletes',
+        'changes',
+        'purges',
+        'all'
+    ]
+    INNODB_FLUSH_CONFIG_VALUES = {
+        'fast': 2,
+        'safest': 1,
+        'unsafe': 0,
+    }
+
     def human_to_bytes(self, human):
         """Convert human readable configuration options to bytes."""
         num_re = re.compile('^[0-9]+$')
@@ -399,7 +414,18 @@
             mysql_config['wait_timeout'] = config['wait-timeout']
 
         if 'innodb-flush-log-at-trx-commit' in config:
-            mysql_config['innodb_flush_log_at_trx_commit'] = config['innodb-flush-log-at-trx-commit']
+            mysql_config['innodb_flush_log_at_trx_commit'] = \
+                config['innodb-flush-log-at-trx-commit']
+        elif 'tuning-level' in config:
+            mysql_config['innodb_flush_log_at_trx_commit'] = \
+                self.INNODB_FLUSH_CONFIG_VALUES.get(config['tuning-level'], 1)
+
+        if ('innodb-change-buffering' in config and
+                config['innodb-change-buffering'] in self.INNODB_VALID_BUFFERING_VALUES):
+            mysql_config['innodb_change_buffering'] = config['innodb-change-buffering']
+
+        if 'innodb-io-capacity' in config:
+            mysql_config['innodb_io_capacity'] = config['innodb-io-capacity']
 
         # Set a sane default key_buffer size
         mysql_config['key_buffer'] = self.human_to_bytes('32M')

=== modified file 'tests/contrib/database/test_mysql.py'
--- tests/contrib/database/test_mysql.py	2017-02-24 16:57:44 +0000
+++ tests/contrib/database/test_mysql.py	2017-03-02 11:55:48 +0000
@@ -301,3 +301,97 @@
         self.assertEqual(
             mysql_config.get('wait_timeout'),
             timeout)
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
+    def test_parse_config_tuning_level(self, mog,
+                                       config, mem):
+        mem.return_value = "512M"
+        config.return_value = {
+            'tuning-level': 'safest',
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(
+            mysql_config.get('innodb_flush_log_at_trx_commit'),
+            1
+        )
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
+    def test_parse_config_tuning_level_fast(self, mog,
+                                            config, mem):
+        mem.return_value = "512M"
+        config.return_value = {
+            'tuning-level': 'fast',
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(
+            mysql_config.get('innodb_flush_log_at_trx_commit'),
+            2
+        )
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
+    def test_parse_config_tuning_level_unsafe(self, mog,
+                                              config, mem):
+        mem.return_value = "512M"
+        config.return_value = {
+            'tuning-level': 'unsafe',
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(
+            mysql_config.get('innodb_flush_log_at_trx_commit'),
+            0
+        )
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
+    def test_parse_config_innodb_valid_values(self, mog,
+                                              config, mem):
+        mem.return_value = "512M"
+        config.return_value = {
+            'innodb-change-buffering': 'all',
+            'innodb-io-capacity': 100,
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertEqual(
+            mysql_config.get('innodb_change_buffering'),
+            'all'
+        )
+
+        self.assertEqual(
+            mysql_config.get('innodb_io_capacity'),
+            100
+        )
+
+    @mock.patch.object(mysql.PerconaClusterHelper, 'get_mem_total')
+    @mock.patch.object(mysql, 'config_get')
+    @mock.patch.object(mysql, 'log')
+    def test_parse_config_innodb_invalid_values(self, mog,
+                                                config, mem):
+        mem.return_value = "512M"
+        config.return_value = {
+            'innodb-change-buffering': 'invalid',
+        }
+
+        helper = mysql.PerconaClusterHelper()
+        mysql_config = helper.parse_config()
+
+        self.assertTrue('innodb_change_buffering' not in mysql_config)
+        self.assertTrue('innodb_io_capacity' not in mysql_config)