Fixes for clustercheck

.kitchen.yml

@@ -14,6 +14,13 @@ provisioner:
   formula: galera
   grains:
     noservices: True
+  dependencies:
+    - name: mysql
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-mysql.git
+    - name: linux
+      repo: git
+      source: https://github.com/salt-formulas/salt-formula-linux.git
   state_top:
     base:
       "*":
@@ -27,14 +34,6 @@ provisioner:
           - galeracluster_debian_repo
   pillars-from-files:
     galeracluster_debian_repo.sls: tests/pillar/repo_galeracluster.sls
-  dependencies:
-    - name: mysql
-      repo: git
-      source: https://github.com/salt-formulas/salt-formula-mysql.git
-  dependencies:
-    - name: linux
-      repo: git
-      source: https://github.com/salt-formulas/salt-formula-linux.git
 
 verifier:
   name: inspec

.travis.yml

@@ -25,7 +25,7 @@ before_script:
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks:

README.rst

@@ -68,7 +68,6 @@ Additional mysql users:
             password: clustercheck
             database: '*.*'
             grants: PROCESS
-            grant_option: False
           - name: inspector
             host: 127.0.0.1
             password: password
@@ -76,20 +75,22 @@ Additional mysql users:
               mydb:
                 - database: mydb
                 - table: mytable
-                - grant_option: False
+                - grant_option: True
                 - grants:
                   - all privileges
 
-Additional check params: 
-    mysql:
-      server:
-        clustercheck:
-          - user: clustercheck
-          - password: clustercheck
-          - available_when_donor: 0
-          - available_when_readonly: 1
-          - enabled: True
-          - xinetd_port 9200
+Additional check params:
+
+.. code-block:: yaml
+
+    galera:
+      clustercheck:
+        - enabled: True
+        - user: clustercheck
+        - password: clustercheck
+        - available_when_donor: 0
+        - available_when_readonly: 1
+        - port 9200
 
 
 Usage
@@ -98,7 +99,7 @@ Usage
 MySQL Galera check sripts
 
 .. code-block:: bash
-    
+
     mysql> SHOW STATUS LIKE 'wsrep%';
 
     mysql> SHOW STATUS LIKE 'wsrep_cluster_size' ;"

galera/clustercheck.sls

@@ -0,0 +1,49 @@
+{%- from "galera/map.jinja" import clustercheck %}
+
+{%- if clustercheck.get('enabled', False) %}
+clustercheck_dir:
+  file.directory:
+  - name: /usr/local/bin/
+  - user: root
+  - group: root
+  - mode: 750
+
+/usr/local/bin/mysql_clustercheck:
+  file.managed:
+    - source: salt://galera/files/clustercheck.sh
+    - user: root
+    - group: root
+    - mode: 755
+    - require:
+      - file: clustercheck_dir
+
+/etc/xinetd.d/mysql_clustercheck.conf:
+  file.managed:
+    - source: salt://galera/files/xinet.d.conf
+    - template: jinja
+    - defaults:
+        user: nobody
+        server: '/usr/local/bin/clustercheck {{ clustercheck.get('user', 'clustercheck') }} {{ clustercheck.get('password', 'clustercheck') }} {{ clustercheck.get('available_when_donor', 0) }} {{ clustercheck.get('available_when_readonly', 0) }}'
+        port: clustercheck.get('port', 9200)
+        flags: REUSE
+        per_source: UNLIMITED
+    - require:
+      - file: /usr/local/bin/mysql_clustercheck
+{%- if not grains.get('noservices', False) %}
+    - watch_in:
+      - galera_xinetd_service
+{%- endif %}
+
+galera_xinetd_package:
+  pkg.installed:
+  - name: xinetd
+
+{%- if not grains.get('noservices', False) %}
+galera_xinetd_service:
+  service.running:
+  - name: xinetd
+  - require:
+    - pkg: xinetd
+{%- endif %}
+{%- endif %}
+

galera/init.sls

@@ -7,6 +7,9 @@ include:
 {%- if pillar.galera.slave is defined %}
 - galera.slave
 {%- endif %}
+{%- if pillar.galera.clustercheck is defined %}
+- galera.clustercheck
+{%- endif %}
 {%- if pillar.galera.monitor is defined %}
 - galera.monitor
 {%- endif %}

galera/map.jinja

@@ -55,3 +55,15 @@
     'config': '/etc/mysql/my.cnf',
     },
 }, grain='oscodename', merge=pillar.galera.get('slave', {}))) %}
+
+{% set clustercheck = salt['grains.filter_by']({
+  'default': {
+    'clustercheck': {
+     'enabled': True,
+     'user': clustercheck,
+     'password': clustercheck,
+     'port': '9200'
+    },
+  },
+}, merge=pillar.galera.get('clustercheck', {})) %}
+

galera/master.sls

@@ -84,6 +84,7 @@ galera_init_script:
   - defaults:
       service: {{ master|yaml }}
   - template: jinja
+  - timeout: 1800
 
 galera_bootstrap_script:
   file.managed:
@@ -115,6 +116,7 @@ galera_init_start_service:
   - require:
     - file: galera_run_dir
     - file: galera_init_script
+  - timeout: 1800
 
 galera_bootstrap_set_root_password:
   cmd.run:

galera/server.sls

@@ -1,20 +1,33 @@
 {%- if pillar.get('mysql', {}).server is defined  %}
-
+{%- from "mysql/map.jinja" import mysql_connection_args as connection %}
 {%- set server = pillar.mysql.server %}
 
 {%- for database_name, database in server.get('database', {}).iteritems() %}
 
+{%- if not grains.get('noservices', False) %}
 mysql_database_{{ database_name }}:
   mysql_database.present:
   - name: {{ database_name }}
+  - character_set: {{ database.get('encoding', 'utf8') }}
+  - connection_user: {{ connection.user }}
+  - connection_pass: {{ connection.password }}
+  - connection_charset: {{ connection.charset }}
+{%- endif %}
 
 {%- for user in database.users %}
-
+{%- if not grains.get('noservices', False) %}
 mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}:
   mysql_user.present:
   - host: '{{ user.host }}'
   - name: '{{ user.name }}'
+  {%- if user.password is defined %}
   - password: {{ user.password }}
+  {%- else %}
+  - allow_passwordless: true
+  {%- endif %}
+  - connection_user: {{ connection.user }}
+  - connection_pass: {{ connection.password }}
+  - connection_charset: {{ connection.charset }}
 
 mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
   mysql_grants.present:
@@ -22,14 +35,16 @@ mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
   - database: '{{ database_name }}.*'
   - user: '{{ user.name }}'
   - host: '{{ user.host }}'
+  - connection_user: {{ connection.user }}
+  - connection_pass: {{ connection.password }}
+  - connection_charset: {{ connection.charset }}
   - require:
     - mysql_user: mysql_user_{{ user.name }}_{{ database_name }}_{{ user.host }}
     - mysql_database: mysql_database_{{ database_name }}
-
+{%- endif %}
 {%- endfor %}
 
 {%- if database.initial_data is defined %}
-
 /root/mysql/scripts/restore_{{ database_name }}.sh:
   file.managed:
   - source: salt://mysql/conf/restore.sh
@@ -49,45 +64,47 @@ restore_mysql_database_{{ database_name }}:
   - cwd: /root
   - require:
     - file: /root/mysql/scripts/restore_{{ database_name }}.sh
-
 {%- endif %}
 
 {%- endfor %}
 
-{%- if not grains.get('noservices', False) %}
 {%- for user in server.get('users', []) %}
-{%- set user_hosts = user.get('hosts', user.get('host', 'localhost'))|sequence %}
-{%- for host in user_hosts %}
+{%- for host in user.get('hosts', user.get('host', 'localhost'))|sequence %}
+{%- if not grains.get('noservices', False) %}
 mysql_user_{{ user.name }}_{{ host }}:
   mysql_user.present:
-  - host: '{{ user.host }}'
+  - host: '{{ host }}'
   - name: '{{ user.name }}'
   {%- if user['password_hash'] is defined %}
     - password_hash: '{{ user.password_hash }}'
   {%- elif user['password'] is defined and user['password'] != None %}
-    - password: '{{ user.password }}'
+  - password: '{{ user.password }}'
   {%- else %}
   - allow_passwordless: True
   {%- endif %}
-  - connection_charset: utf8
+  - connection_user: {{ connection.user }}
+  - connection_pass: {{ connection.password }}
+  - connection_charset: {{ connection.charset }}
 
 {%- if 'grants' in user %}
 mysql_user_{{ user.name }}_{{ host }}_grants:
   mysql_grants.present:
     - name: {{ user.name }}
     - grant: {{ user['grants']|sequence|join(",") }}
-    - database: '*.*'
+    - database: user.get('database','*.*')
     - grant_option: {{ user['grant_option'] | default(False) }}
     - user: {{ user.name }}
     - host: '{{ host }}'
-    - connection_charset: utf8
+    - connection_user: {{ connection.user }}
+    - connection_pass: {{ connection.password }}
+    - connection_charset: {{ connection.charset }}
     - require:
       - mysql_user_{{ user.name }}_{{ host }}
 {%- endif %}
 
 {%- if 'databases' in user %}
-{% for db in user['databases'] %}
-mysql_user_{{ user.name }}_{{ host }}_grants_db_{{ db }} ~ '_' ~ loop.index0:
+{%- for db in user['databases'] %}
+mysql_user_{{ user.name }}_{{ host }}_grants_db_{{ db.database }}_{{ loop.index0 }}:
   mysql_grants.present:
     - name: {{ user.name ~ '_' ~ db['database']  ~ '_' ~ db['table'] | default('all') }}
     - grant: {{db['grants']|sequence|join(",")}}
@@ -95,87 +112,18 @@ mysql_user_{{ user.name }}_{{ host }}_grants_db_{{ db }} ~ '_' ~ loop.index0:
     - grant_option: {{ db['grant_option'] | default(False) }}
     - user: {{ user.name }}
     - host: '{{ host }}'
-    - connection_charset: utf8
+    - connection_user: {{ connection.user }}
+    - connection_pass: {{ connection.password }}
+    - connection_charset: {{ connection.charset }}
     - require:
       - mysql_user_{{ user.name }}_{{ host }}
-      - mysql_database_{{ db }}
+      - mysql_database_{{ db.database }}
 {%- endfor %}
 {%- endif %}
 
-{%- endfor %}
-{%- endfor %}
-
 {%- endif %}
-
-{%- set _galera_xinetd_srv = [] %}
-
-{%- for server_name, server in slave.get('bind', {}).iteritems() %}
-{%- if server.get.get('clustercheck', {}).get('enabled', False) == True %}
-{%- for bind in slave.bind %}
-{%- set index = '_{0}_{1}'.format(bind.address, bind.port) %}
-{%- set _ccheck = server.clustercheck %}
-{%- do _galera_xinetd_srv.append('clustercheck') %}
-/etc/xinetd.d/mysql_clustercheck{{ index }}_{{ _ccheck.get('clustercheckport', 9200) }}:
-  file.managed:
-    - source: salt://galera/files/xinet.d.conf
-    - template: jinja
-    - defaults:
-        user: nobody
-        # FIXME, add optins if check_attr host/port is defined etc..
-        server: '/usr/local/bin/clustercheck {{ _ccheck.get('user', 'clustercheck') }} {{ _ccheck.get('password', 'clustercheck') }} {{ _ccheck.get('available_when_donor', 0) }} {{ _ccheck.get('available_when_readonly', 0) }}'
-        port: _ccheck.get('port', 9200)
-        flags: REUSE
-        per_source: UNLIMITED
-    - require:
-      - file: /usr/local/bin/mysql_clustercheck
-    - watch_in:
-      - galera_xinetd_service
-
 {%- endfor %}
-{%- endif %}
 {%- endfor %}
 
-{% if 'clustercheck' in _galera_xinetd_srv %}
-clustercheck_dir:
-  file.directory:
-  - name: /usr/local/bin/
-  - user: root
-  - group: root
-  - mode: 750
 
-/usr/local/bin/mysql_clustercheck:
-  file.managed:
-    - source: salt://galera/files/clustercheck.sh
-    - user: root
-    - group: root
-    - mode: 755
-    - require:
-      - file: clustercheck_dir
 {%- endif %}
-
-{%- if _galera_xinetd_srv|length > 0 %}
-haproxy_xinetd_package:
-  pkg.installed:
-  - name: xinetd
-
-galera_xinetd_service:
-  service.running:
-  - name: xinetd
-  - require:
-    - pkg: xinetd
-{%- endif %}
-
-{%- if _galera_xinetd_srv|length > 0 %}
-haproxy_xinetd_package:
-  pkg.installed:
-  - name: xinetd
-
-galera_xinetd_service:
-  service.running:
-  - name: xinetd
-  - require:
-    - pkg: xinetd
-{%- endif %}
-
-
-{%- endif %}

galera/slave.sls

@@ -115,6 +115,7 @@ galera_init_start_service:
   - require: 
     - file: galera_run_dir
     - file: galera_init_script
+  - timeout: 1800
 
 galera_bootstrap_set_root_password:
   cmd.run:
@@ -155,6 +156,7 @@ galera_bootstrap_start_service_final:
   - require: 
     - file: galera_bootstrap_init_config
     - file: galera_bootstrap_script
+  - timeout: 1800
 
 galera_bootstrap_finish_flag:
   file.touch:
@@ -179,73 +181,11 @@ galera_config:
   {%- endif %}
 
 {%- if not grains.get('noservices', False) %}
-
 galera_service:
   service.running:
   - name: {{ slave.service }}
   - enable: true
   - reload: true
-
-{%- endif %}
-
-
-
-{%- set _galera_xinetd_srv = [] %}
-
-{%- for server_name, server in master.get('bind', {}).iteritems() %}
-{%- if server.get.get('clustercheck', {}).get('enabled', False) == True %}
-{%- for bind in slave.bind %}
-{%- set index = '_{0}_{1}'.format(bind.address, bind.port) %}
-{%- set _ccheck = server.clustercheck %}
-{%- do _galera_xinetd_srv.append('clustercheck') %}
-/etc/xinetd.d/mysql_clustercheck{{ index }}_{{ _ccheck.get('clustercheckport', 9200) }}:
-  file.managed:
-    - source: salt://galera/files/xinet.d.conf
-    - template: jinja
-    - defaults:
-        user: nobody
-        # FIXME, add optins if check_attr host/port is defined etc..
-        server: '/usr/local/bin/clustercheck {{ _ccheck.get('user', 'clustercheck') }} {{ _ccheck.get('password', 'clustercheck') }} {{ _ccheck.get('available_when_donor', 0) }} {{ _ccheck.get('available_when_readonly', 0) }}'
-        port: _ccheck.get('port', 9200)
-        flags: REUSE
-        per_source: UNLIMITED
-    - require:
-      - file: /usr/local/bin/mysql_clustercheck
-    - watch_in:
-      - galera_xinetd_service
-
-{%- endfor %}
-{%- endif %}
-{%- endfor %}
-
-{% if 'clustercheck' in _galera_xinetd_srv %}
-clustercheck_dir:
-  file.directory:
-  - name: /usr/local/bin/
-  - user: root
-  - group: root
-  - mode: 750
-
-/usr/local/bin/mysql_clustercheck:
-  file.managed:
-    - source: salt://galera/files/clustercheck.sh
-    - user: root
-    - group: root
-    - mode: 755
-    - require:
-      - file: clustercheck_dir
-{%- endif %}
-
-{%- if _galera_xinetd_srv|length > 0 %}
-haproxy_xinetd_package:
-  pkg.installed:
-  - name: xinetd
-
-galera_xinetd_service:
-  service.running:
-  - name: xinetd
-  - require:
-    - pkg: xinetd
 {%- endif %}
 
 

tests/pillar/master_cluster.sls

@@ -7,7 +7,7 @@
         port: 3306
       maintenance_password: password
       admin:
-        user: user
+        user: root
         password: password
       members:
       - host: 127.0.0.1
@@ -16,6 +16,13 @@
         port: 4567
       - host: 127.0.0.1
         port: 4567
+      clustercheck:
+        enabled: True
+        user: clustercheck
+        password: password
+        available_when_donor: 1
+        available_when_readonly: 1
+        port: 9200
   mysql:
     server:
       users:
@@ -27,17 +34,15 @@
         host: 127.0.0.1
       - name: clustercheck
         #host: localhost
-        password: clustercheck
+        password: password
         database: '*.*'
         grants: PROCESS
-        grant_option: False
       - name: inspector
         host: 127.0.0.1
         password: password
         databases:
-          mydb:
-            - database: mydb
-            - table: mytable
-            - grant_option: False
-            - grants:
-              - all privileges
+          - database: mydb
+            table: mytable
+            grant_option: True
+            grants:
+            - all privileges

tests/pillar/slave_cluster.sls

@@ -7,7 +7,7 @@
         port: 3306
       maintenance_password: password
       admin:
-        user: user
+        user: root
         password: password
       members:
       - host: 127.0.0.1
@@ -16,6 +16,13 @@
         port: 4567
       - host: 127.0.0.1
         port: 4567
+      clustercheck:
+        enabled: True
+        user: clustercheck
+        password: password
+        available_when_donor: 1
+        available_when_readonly: 1
+        port: 9200
   mysql:
     server:
       users:
@@ -24,4 +31,9 @@
       - name: haproxy
         host: '%'
       - name: haproxy
-        host: 127.0.0.1
+        host: 127.0.0.1
+      - name: clustercheck
+        #host: localhost
+        password: password
+        database: '*.*'
+        grants: PROCESS

tests/run_tests.sh

@@ -126,6 +126,7 @@ prepare() {
 run() {
     for pillar in ${PILLARDIR}/*.sls; do
         state_name=$(basename ${pillar%.sls})
+        salt_run grains.set 'noservices' False force=True
         salt_run --id=${state_name} state.show_sls ${FORMULA_NAME} || (log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1)
     done
 }