Merge lp:~mariosplivalo/charms/trusty/percona-cluster/table-cache into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Mario Splivalo]

This MP adds the table-open-cache charm config option so that sysadmin deploying the charm can tune table_open_cache mysql variable (formerly known as table_cache - both options are accepted in 5.5).

Also, it raises the default for table_open_cache from 512 to 2048 - this is a sane default as there is no significant increased memory usage with larger table_open_cache, and most deploys would benefit from having larger table cache.

[Billy Olsen (billy-olsen)]

Mario, looks good to me - thanks for the submission. Approved.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-02-11 20:16:48 +0000
+++ config.yaml	2015-02-16 14:18:43 +0000
@@ -68,6 +68,11 @@
       InnoDB table into separate .idb file. Existing InnoDB tables will remain
       in ibdata1 file - full dump/import is needed to get rid of large
       ibdata1 file
+  table-open-cache:
+    type: int
+    default: 2048
+    description:
+      Sets table_open_cache (formerly known as table_cache) to mysql.
   lp1366997-workaround:
     type: boolean
     default: False
 
=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-02-11 23:16:02 +0000
+++ hooks/percona_hooks.py	2015-02-16 14:18:43 +0000
@@ -113,11 +113,10 @@
         'sst_method': 'xtrabackup',
         'sst_password': mysql_password,
         'innodb_file_per_table': config('innodb-file-per-table'),
+        'table_open_cache': config('table-open-cache'),
         'lp1366997_workaround': config('lp1366997-workaround')
     }
 
-    print config
-
     if config('prefer-ipv6'):
         # NOTE(hopem): this is a kludge to get percona working with ipv6.
         # See lp 1380747 for more info. This is intended as a stop gap until
 
=== modified file 'templates/my.cnf'
--- templates/my.cnf	2015-02-11 20:16:48 +0000
+++ templates/my.cnf	2015-02-16 14:18:43 +0000
@@ -61,7 +61,7 @@
 
 # Fine tuning
 key_buffer_size = {{ key_buffer }}
-table_cache = 512
+table_open_cache = {{ table_open_cache }}
 max_allowed_packet = 16M
 
 # InnoDB buffer should consume 100% of the bytes of the dataset size