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

[Mario Splivalo]

This adds two charm configuration options - enable_binlogs and binlogs_path. Binlog_path defaults to /var/log/mysql/mysql.bin (it's because my.cnf which is packaged with mysql-common package suggests that location, and also because mysql charm defaults with binlogs at that location), while enable_binlogs defaults to 'False'.

[Felipe Reyes (freyes)]

Hi Mario,

This feature makes a lot of sense, and it worked for me, but please add unit tests for your patch, I also have minor comments in the diff.

Thanks,

review: Needs Fixing

[James Page (james-page)]

bzr merge lp:~mariosplivalo/charms/trusty/percona-cluster/enable-binlogs
...
Text conflict in hooks/charmhelpers/contrib/database/mysql.py
1 conflicts encountered.

review: Needs Fixing

[James Page (james-page)]

review: Needs Fixing

[Mario Splivalo (mariosplivalo)]

> bzr merge lp:~mariosplivalo/charms/trusty/percona-cluster/enable-binlogs
> ...
> Text conflict in hooks/charmhelpers/contrib/database/mysql.py
> 1 conflicts encountered.

I belive this is because of the prerequisite branch that needs merging first.

[Mario Splivalo (mariosplivalo)]

Based on discussion with Ed, this will be changed in a manner so that a new function is introduced, 'configure_binlogs'. That one will be called from install hook, after mysql has been installed, and will restart mysql for the change to take place.
It will also be called from config_changed hook, but it won't restart mysql - it will log a WARNING inside logs to tell administrator/operator to manually restart mysql when appropriate.

[lp:~mariosplivalo/charms/trusty/percona-cluster/enable-binlogs]

59. By Mario Splivalo on 2015-10-16

Isolate creation of binlog directory into a separate function

60. By Mario Splivalo on 2015-10-18

Merged /next

61. By Mario Splivalo on 2015-12-03

Conflicts resolved (work from another workstation)

Unmerged revisions

61. By Mario Splivalo on 2015-12-03

Conflicts resolved (work from another workstation)

60. By Mario Splivalo on 2015-10-18

Merged /next

59. By Mario Splivalo on 2015-10-16

Isolate creation of binlog directory into a separate function

58. By Mario Splivalo on 2015-10-09

Merged from /next

57. By Mario Splivalo on 2015-03-12

Fixed typos, as suggested by freyes

56. By Mario Splivalo on 2015-03-12

Fix lint errors

55. By Mario Splivalo on 2015-03-06

Remove call to lchownr as it won't change owner of the base directory.
Instead, use os.chown.

54. By Mario Splivalo on 2015-03-06

Fix directory creation

53. By Mario Splivalo on 2015-03-05

Make sure mysql can start even when binlog_path is pointing to
nonexistant path

52. By Mario Splivalo on 2015-03-04

Create binlog_directory, if missing

=== modified file 'config.yaml'
--- config.yaml	2015-07-27 09:44:19 +0000
+++ config.yaml	2015-10-09 11:16:10 +0000
@@ -145,3 +145,14 @@
     description: |
       A comma-separated list of nagios servicegroups. If left empty, the
       nagios_context will be used as the servicegroup.
+  enable-binlogs:
+    default: False
+    type: boolean
+    description: Turns on MySQL binary logs. The placement of the logs is controlled with the binlogs_path config option.
+  binlogs-path:
+    default: /var/log/mysql/mysql-bin.log
+    type: string
+    description: |
+      Location on the filesystem where binlogs are going to be placed.
+      Default mimics what mysql-common would do for mysql (although not the
+      best place for binlogs)
 
=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-09-23 18:29:21 +0000
+++ hooks/percona_hooks.py	2015-10-09 11:16:10 +0000
@@ -4,6 +4,8 @@
 import json
 import os
 import socket
+import pwd
+import grp
 import time
 
 from charmhelpers.core.hookenv import (
@@ -31,6 +33,7 @@
     service_start,
     file_hash,
     lsb_release,
+    mkdir
 )
 from charmhelpers.core.templating import render
 from charmhelpers.fetch import (
@@ -124,7 +127,9 @@
         'sst_password': config('sst-password'),
         'innodb_file_per_table': config('innodb-file-per-table'),
         'table_open_cache': config('table-open-cache'),
-        'lp1366997_workaround': config('lp1366997-workaround')
+        'lp1366997_workaround': config('lp1366997-workaround'),
+        'binlogs_path': config('binlogs-path'),
+        'enable_binlogs': config('enable-binlogs')
     }
 
     if config('prefer-ipv6'):
@@ -137,6 +142,23 @@
     else:
         context['ipv6'] = False
 
+    # When render_config is called from the install hook, mysql is not
+    # yet installed. So we need to create binlogs_path directory world-writable
+    # We need that directory as otherwise mysql won't start
+    binlogs_directory = os.path.dirname(context['binlogs_path'])
+    if not os.path.isdir(binlogs_directory):
+        mkdir(binlogs_directory, 'root', 'root', 0o777)
+
+    # Assuming this is also called from config_changed, we now check if
+    # mysql uid/gid exists on the system. If so we chown binlogs_path to mysql
+    try:
+        uid = pwd.getpwnam('mysql').pw_uid
+        gid = grp.getgrnam('mysql').gr_gid
+        os.chown(binlogs_directory, uid, gid)
+        os.chmod(binlogs_directory, 0o750)
+    except KeyError:
+        pass
+
     context.update(PerconaClusterHelper().parse_config())
     render(os.path.basename(MY_CNF), MY_CNF, context, perms=0o444)
 
 
=== modified file 'templates/my.cnf'
--- templates/my.cnf	2015-06-04 14:40:54 +0000
+++ templates/my.cnf	2015-10-09 11:16:10 +0000
@@ -25,6 +25,10 @@
 # In order for Galera to work correctly binlog format should be ROW
 binlog_format=ROW
 
+{% if enable_binlogs -%}
+log_bin={{ binlogs_path }}
+{% endif -%}
+
 # MyISAM storage engine has only experimental support
 default_storage_engine=InnoDB