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

[Jorge Niedbalski]

- Fixes bug lp: #1425528

[Mario Splivalo (mariosplivalo)]

This looks fine to me.

review: Approve

[Felipe Reyes (freyes)]

LGTM

review: Approve

[Billy Olsen (billy-olsen)]

Couple of minor nits, but looks good to me. If you could at least fix the default value in the config.yaml file that'd be groovy.

review: Needs Fixing

[Billy Olsen (billy-olsen)]

After further discussion, the innodb-buffer-pool-size seems to have the same definition as the datasest-size. The innodb-buffer-pool-size config-option is being provided as a means of being explicit in what option within percona this value is setting. The dataset-size option was previously used to configure this however it didn't appear to be working due to the preferred engine not being set.

I think with the log entry indicating that the dataset-size option has been deprecated we should also make an announcement in the overall config.yaml file telling the user that this has been deprecated.

[James Page (james-page)]

review: Needs Fixing

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

50. By Jorge Niedbalski on 2015-04-02

Resync merge

Unmerged revisions

50. By Jorge Niedbalski on 2015-04-02

Resync merge

49. By Jorge Niedbalski on 2015-02-26

Fixes bug LP: #1425528

=== modified file 'config.yaml'
--- config.yaml	2015-03-04 15:30:55 +0000
+++ config.yaml	2015-04-02 17:34:05 +0000
@@ -81,4 +81,12 @@
     type: boolean
     default: False
     description: Adds two config options (wsrep_drupal_282555_workaround and wsrep_retry_autocommit) as a workaround for Percona Primary Key bug (see lplp1366997).
+  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 'templates/my.cnf'
--- templates/my.cnf	2015-03-04 15:30:55 +0000
+++ templates/my.cnf	2015-04-02 17:34:05 +0000
@@ -69,9 +69,9 @@
 table_open_cache = {{ table_open_cache }}
 max_allowed_packet = 16M
 
-# 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 by default will be set to 50% of the system available RAM
+# unless a specified value is set on configuration.
+innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
 
 {% if ipv6 -%}
 [sst]