repman: check need-start instead of restart job for databases

software/repman/buildout.hash.cfg

@@ -14,11 +14,11 @@
 # not need these here).
 [instance.cfg]
 filename = instance.cfg.in
-md5sum = 8f3e5d9c0de16006cb36f0b8121fc11a
+md5sum = bc4f2f33c18d5372f2ecfa6940cf1b0d
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = 2688b8aa946d4878d3f1c4fa08375cfe
+md5sum = dc86b3d180cb002919d1b4faf680b256
 
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in
@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
 
 [template-mariadb.cfg]
 _update_hash_filename_ = instance-mariadb.cfg.jinja2.in
-md5sum = 10dea9ec48ce889315202d112a66f121
+md5sum = 7d7738da2974578f393130b97acdcab7
 
 [template-my-cnf]
 _update_hash_filename_ = templates/my.cnf.in
@@ -58,4 +58,8 @@ md5sum = 99324b56192003254081ef336dcee94c
 
 [dbjobs-in]
 _update_hash_filename_ = templates/dbjobs.in
-md5sum = 1e250376c55f9a5c19409b200f9b45a3
+md5sum = d623a4c684578602b9d8ee49034aebfa
+
+[mysqld-need-start.sh.in]
+_update_hash_filename_ = templates/mysqld-need-start.sh.in
+md5sum = ec15a9ca52ee3497885c85aa2a7a9008

software/repman/instance-mariadb.cfg.jinja2.in

@@ -275,16 +275,39 @@ command = ${dbjobs-executable:rendered}
 < = jinja2-template-executable
 rendered = ${directory:bin}/mysqld_restart
 template = inline:#!/bin/sh
+  ${mariadb-controller-bin:wrapper-path} status
   ${mariadb-controller-bin:wrapper-path} restart mariadb
   sleep 1
   ${mariadb-controller-bin:wrapper-path} status
 
+[{{ section('mariadb-need-start') }}]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = mariadb-need-start
+frequency = * * * * *
+command = ${template-mysqld-need-start:rendered}
+
+[template-mysqld-need-start]
+< = jinja2-template-executable
+rendered = ${directory:bin}/mysqld_need_start
+template = {{ parameter_dict['template-mysqld-need-start'] }}
+context =
+  key mariadb_controller mariadb-controller-bin:wrapper-path
+  raw username           {{ slapparameter_dict['repman-user'] }}
+  raw password           {{ slapparameter_dict['repman-passwd'] }}
+  raw secure_url         {{ slapparameter_dict['repman-secure-url'] }}
+  raw jq_bin             {{ jq_bin }}
+  raw cluster            {{ slapparameter_dict['cluster'] }}
+  raw db_host            {{ host }}
+  raw db_port            {{ port }}
+  raw bash_bin           {{ bash_bin }}
+  raw curl_bin           {{ curl_bin }}
+
 # Donwnload mariadb configuration from repman
 [{{ section('install-mysql-config') }}]
 recipe = plone.recipe.command
 stop-on-error = true
-# XXX - for now, we make only one cluster
-cluster = cluster1
+cluster = {{ slapparameter_dict['cluster'] }}
 config = ${directory:etc}/mysql/my.cnf
 command =
   cd ${directory:config-tmp} &&

software/repman/instance-repman-input-schema.json

@@ -237,9 +237,9 @@
 						},
 						"failover-mode": {
 							"title": "Failover mode",
-							"description": "Failover is manual or automatic (default \"automatic\").",
+							"description": "Failover is manual or automatic (default \"manual\").",
 							"type": "string",
-							"default": "automatic",
+							"default": "manual",
               "enum": [
                 "manual",
                 "automatic"

software/repman/instance-repman.cfg.jinja2.in

@@ -64,21 +64,24 @@ maximum = 7132
 {% for i in range(0, db_amount) -%}
 {% do mariadb_dict.__setitem__('tcp-port', 2099 + (i * 100)) -%}
 {% set section = 'request-mariadb-' ~ i -%}
-{% set name = 'Mariadb-' ~ i -%}
+{% set dbname = 'Mariadb-' ~ i -%}
 
 [{{ section }}]
 <= request-common
 software-type = mariadb
-name = {{ name }}
+name = {{ dbname }}
 sla-computer_guid = {{ dumps(parameter_dict.get('-sla-' ~ i ~'-computer_guid', '')) }}
 {% for key, value in mariadb_dict.items() -%}
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}
 config-monitor-passwd = ${publish-early:monitor-password}
 config-root-password = ${publish-early:db-root-password}
+config-repman-user = ${repman-parameter:username}
+config-repman-passwd =  ${repman-parameter:password}
 config-repman-url = ${nginx-parameter:backend-url}
-config-repman-secure-url = ${nginx-parameter:backend-url}
-config-name = {{ name }}
+config-repman-secure-url = ${nginx-parameter:backend-ssl-url}
+config-cluster = {{ name }}
+config-name = {{ dbname }}
 return = 
   database-host
   monitor-base-url
@@ -123,7 +126,7 @@ db-memory = {{ parameter_dict.get("db-memory", 256) }}
 db-memory-shared-pct = {{ parameter_dict.get("db-memory-shared-pct", "threads:16,innodb:60,myisam:10,aria:10,rocksdb:1,tokudb:1,s3:1,archive:1,querycache:0") }}
 db-memory-threaded-pct = {{ parameter_dict.get("db-memory-threaded-pct", "tmp:70,join:20,sort:10") }}
 # failover
-failover-mode = {{ parameter_dict.get('failover-mode', 'automatic') }}
+failover-mode = {{ parameter_dict.get('failover-mode', 'manual') }}
 failover-limit = {{ parameter_dict.get('failover-limit', 5) }}
 failover-falsepositive-heartbeat = {{ parameter_dict.get('failover-falsepositive-heartbeat', True) }}
 failover-falsepositive-heartbeat-timeout = {{ parameter_dict.get('failover-falsepositive-heartbeat-timeout', 3) }}

software/repman/instance.cfg.in

@@ -81,6 +81,7 @@ template-mariadb-initial-setup = {{ template_mariadb_initial_setup }}
 template-mariadb-init-root = {{ template_init_root_sql }}
 template-init-root-wrapper = {{ template_init_root_wrapper }}
 template-mysqld-wrapper = {{ template_mysqld_wrapper }}
+template-mysqld-need-start = {{ mysqld_start_template }}
 link-binary = {{ dumps(mariadb_link_binary) }}
 check-computer-memory-binary = {{ bin_directory }}/check-computer-memory
 bin-directory = {{ bin_directory }}

software/repman/software.cfg

@@ -62,6 +62,7 @@ context =
     key template_monitor monitor2-template:rendered
     key mariadb_link_binary template-mariadb.cfg:link-binary
     key mariadb_location mariadb:location
+    key mysqld_start_template mysqld-need-start.sh.in:target
     key nginx_conf_in nginx.conf.in:target
     key nginx_location nginx:location
     key percona_toolkit_location percona-toolkit:location
@@ -142,6 +143,9 @@ link-binary =
 [dbjobs-in]
 <= download-file
 
+[mysqld-need-start.sh.in]
+<= download-file
+
 # Pin versions of eggs used that are not already pinned by stack/slapos.cfg
 [versions]
 slapos.recipe.template = 4.3

software/repman/templates/dbjobs.in

@@ -7,7 +7,7 @@ SLOWLOG={{ parameter_dict['mysql-dir']}}/.system/logs/sql-slow
 BACKUPDIR={{ parameter_dict['mysql-dir'] }}/.system/backup
 DATADIR={{ parameter_dict['mysql-dir'] }}/
 export PATH={{ parameter_dict['socat-location'] }}/bin:{{ parameter_dict['mysql-location'] }}/bin:$PATH
-JOBS=( "xtrabackup" "mariabackup" "error" "slowquery" "zfssnapback" "optimize" "reseedxtrabackup" "reseedmariabackup" "reseedmysqldump" "flashbackxtrabackup" "flashbackmariadbackup" "flashbackmysqldump" "stop" "start" "restart")
+JOBS=( "xtrabackup" "mariabackup" "error" "slowquery" "zfssnapback" "optimize" "reseedxtrabackup" "reseedmariabackup" "reseedmysqldump" "flashbackxtrabackup" "flashbackmariadbackup" "flashbackmysqldump" "stop" "start")
 
 doneJob()
 {

software/repman/templates/mysqld-need-start.sh.in

+#!{{ bash_bin }}
+
+curl () {
+  {{ curl_bin }} -k --silent -H "Accept: application/json" "$@"
+}
+
+TOKEN=$(curl -s -X POST --data '{"username":"{{ username }}","password":"{{ password }}"}' {{ secure_url }}/api/login | {{ jq_bin }} -r '.token')
+
+# Checking if mariadb start is needed
+CODE=$(curl -H "Authorization: Bearer ${TOKEN}" -o /dev/null -w "%{http_code}" {{ secure_url }}/api/clusters/{{ cluster }}/servers/{{ db_host }}/{{ db_port }}/need-start)
+
+if [ $CODE -eq 200 ]; then
+  echo "$CODE: Starting mariadb service..."
+  # print current status, can be useful for debug...
+  {{ mariadb_controller }} status mariadb
+  {{ mariadb_controller }} start mariadb
+  sleep 5
+  # check again if the service is still up...
+  {{ mariadb_controller }} status mariadb
+fi