Merge lp:~niedbalski/charms/precise/mysql/lp-1296736 into lp:charms/mysql

[Jorge Niedbalski]

Fix for bug #1296736

[lp:~niedbalski/charms/precise/mysql/lp-1296736]

118. By Jorge Niedbalski on 2014-04-11

[config-changed] if not ON, DEMAND , then set the value = 0

[Charles Butler (lazypower)]

Jorge,

Thank you for this patch! I've reviewed and deployed the code. It looks good to me. Merging this in and closing out the bugs as fixed-release.

This will show up in the store in ~ 15 to 30 minutes post merging. If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-02-04 21:48:28 +0000
+++ config.yaml	2014-04-11 16:52:52 +0000
@@ -20,7 +20,7 @@
         type: string
         description: Query cache is usually a good idea, but can hurt concurrency. Valid values are "OFF", "ON", or "DEMAND". http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html#sysvar_query_cache_type
     query-cache-size:
-        default: -1
+        default: 0
         type: int
         description: Override the computed version from dataset-size. Still works if query-cache-type is "OFF" since sessions can override the cache type setting on their own.
     max-connections:

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-02-15 21:37:45 +0000
+++ hooks/config-changed	2014-04-11 16:52:52 +0000
@@ -112,11 +112,17 @@
 
 check_call(['juju-log','-l','INFO','dataset size in bytes: %d' % dataset_bytes])
 
-if configs['query-cache-size'] == -1 and configs['query-cache-type'] in ['ON','DEMAND']:
-    qcache_bytes = (dataset_bytes * 0.20)
-    qcache_bytes = int(qcache_bytes - (qcache_bytes % PAGE_SIZE))
-    configs['query-cache-size'] = qcache_bytes
-    dataset_bytes -= qcache_bytes
+query_cache_size = configs.get('query-cache-size', 0)
+
+QUERY_CACHE_SIZE_FACTOR = (dataset_bytes * 0.20)
+
+if query_cache_size <= 0:
+    if configs['query-cache-type'] in ('ON','DEMAND', ):
+        query_cache_size = int(QUERY_CACHE_SIZE_FACTOR - (QUERY_CACHE_SIZE_FACTOR % PAGE_SIZE))
+    else:
+        query_cache_size = 0
+
+configs['query-cache-size'] = query_cache_size
 
 # 5.5 allows the words, but not 5.1
 if configs['query-cache-type'] == 'ON':
@@ -127,7 +133,8 @@
     configs['query-cache-type']=0
 
 preferred_engines=configs['preferred-storage-engine'].split(',')
-chunk_size = int(dataset_bytes / len(preferred_engines))
+
+chunk_size = int((dataset_bytes - query_cache_size)/len(preferred_engines))
 configs['innodb-flush-log-at-trx-commit']=1
 configs['sync-binlog']=1
 if 'InnoDB' in preferred_engines:
@@ -171,7 +178,7 @@
 # You can copy this to one of:
 # - "/etc/mysql/my.cnf" to set global options,
 # - "~/.my.cnf" to set user-specific options.
-# 
+#
 # One can use all long options that the program supports.
 # Run program with --help to get a list of available options and with
 # --print-defaults to see which it would actually understand and use.
@@ -326,7 +333,7 @@
 
 need_restart = False
 for target,content in targets.iteritems():
-    tdir = os.path.dirname(target) 
+    tdir = os.path.dirname(target)
     if len(content) == 0 and os.path.exists(target):
         os.unlink(target)
         need_restart = True