ERP5: make MariaDB database creation more robust

software/neoppod/software-common.cfg

@@ -147,6 +147,11 @@ template =
       --datadir="$datadir.new"
     mv -v "$datadir.new" "$datadir"
   }
+  {%- if environ is defined %}
+  {%-   for variable in environ.splitlines() %}
+  {{ variable }} \
+  {%-   endfor %}
+  {%- endif %}
   exec '${mariadb:location}/bin/mysqld' \
     --defaults-file='{{defaults_file}}' \
     "$@"

stack/erp5/buildout.cfg

@@ -294,6 +294,7 @@ context =
     key template_mariadb template-mariadb:target
     key template_mariadb_initial_setup template-mariadb-initial-setup:target
     key template_my_cnf template-my-cnf:target
+    key template_mysqld_wrapper template-mysqld-wrapper:rendered
     key template_postfix template-postfix:target
     key template_postfix_aliases template-postfix-aliases:target
     key template_postfix_main_cf template-postfix-main-cf:target

stack/erp5/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 5a93ff00ee4eb60cc065d51fb437877a
+md5sum = 8abd802536f2243d17dea33c225a11ae
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -70,7 +70,7 @@ md5sum = c64f35f825200fe35328641b2b8e0fdd
 
 [template]
 filename = instance.cfg.in
-md5sum = f81f4c9881bf868882cd56fe6a769666
+md5sum = f6c6820f9b3653d0d5c29708606fc591
 
 [monitor-template-dummy]
 filename = dummy.cfg

stack/erp5/instance-mariadb.cfg.in

@@ -126,7 +126,7 @@ command = {{ parameter_dict['findutils-location'] }}/bin/find "${directory:maria
 ip = {{ ip }}
 port = {{ port }}
 socket = ${directory:run}/mariadb.sock
-data-directory = ${directory:mariadb-data}
+data-directory = ${directory:srv}/mariadb
 tmp-directory = ${directory:tmp}
 etc-directory = ${directory:etc}
 pid-file = ${directory:run}/mariadb.pid
@@ -178,25 +178,18 @@ mysql_tzinfo_to_sql = ${binary-wrap-mysql_tzinfo_to_sql:wrapper-path}
 
 [{{ section('mysqld') }}]
 < = jinja2-template-executable
-# Note: all rendering is done when this file is rendered, not when the mysqld
-# section is installed - so I only use jinja2 as a fancy way to write an
-# executable file with partition-dependent but instance-parameters independent
-# content.
-template = inline:#!{{ dash }}
-  '{{ parameter_dict['mariadb-location'] }}/scripts/mysql_install_db' \
-    --defaults-file='${my-cnf:rendered}' \
-    --skip-name-resolve \
-    --datadir='${my-cnf-parameters:data-directory}' \
-    --basedir='{{ parameter_dict['mariadb-location'] }}' \
-    && ODBCSYSINI='${my-cnf-parameters:etc-directory}' \
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ parameter_dict['unixodbc-location'] }}/lib \
-    {% for variable in slapparameter_dict.get('environment-variables', ()) %}
-    {{ variable }} \
-    {% endfor %}
-    exec '{{ parameter_dict['mariadb-location'] }}/bin/mysqld' \
-    --defaults-file='${my-cnf:rendered}' \
-    "$@"
 rendered = ${directory:services}/mariadb
+template = {{ parameter_dict['template-mysqld-wrapper'] }}
+context =
+  key defaults_file my-cnf:rendered
+  key datadir my-cnf-parameters:data-directory
+  key environ :environ
+environ =
+  ODBCSYSINI='${my-cnf-parameters:etc-directory}'
+  LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}'{{ parameter_dict['unixodbc-location'] }}/lib'
+  {% for variable in slapparameter_dict.get('environment-variables', ()) %}
+  {{ variable }}
+  {% endfor %}
 
 [odbc-ini-text]
 text = {{ dumps(slapparameter_dict.get('odbc-ini', '').encode('base64')) }}
@@ -265,7 +258,6 @@ tmp = ${buildout:directory}/tmp
 backup = ${:srv}/backup
 mariadb-backup-full = ${:backup}/mariadb-full
 mariadb-backup-incremental = ${:backup}/mariadb-incremental
-mariadb-data = ${:srv}/mariadb
 mariadb-ssl = ${:etc}/mariadb-ssl
 var = ${buildout:directory}/var
 log = ${:var}/log
@@ -275,7 +267,7 @@ slowquery = ${monitor-directory:private}/slowquery_digest
 [{{ section('resiliency-exclude-file') }}]
 # Generate rdiff exclude file in case of resiliency
 < = jinja2-template-base
-template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:mariadb-backup-incremental}/**\\n${directory:log}/**\\n${directory:tmp}/**\\n" }}' }}
+template = {{ 'inline:{{ "${my-cnf-parameters:data-directory}/**\\n${directory:mariadb-backup-incremental}/**\\n${directory:log}/**\\n${directory:tmp}/**\\n" }}' }}
 rendered = ${directory:srv}/exporter.exclude
 
 [{{ section("resiliency-identity-signature-script")}}]
@@ -295,7 +287,7 @@ rendered = ${directory:bin}/start-clone-from-backup
 context =
   key dash dash:dash
   key client binary-wrap-mysql:wrapper-path
-  key data_directory directory:mariadb-data
+  key data_directory my-cnf-parameters:data-directory
   key pid_file my-cnf-parameters:pid-file
   key server mysqld:rendered
   key update update-mysql:output
@@ -309,7 +301,7 @@ rendered = ${directory:bin}/restore-from-backup
 context =
   key dash dash:dash
   key mysql_executable binary-wrap-mysql:wrapper-path
-  key mariadb_data_directory directory:mariadb-data
+  key mariadb_data_directory my-cnf-parameters:data-directory
   key mariadb_backup_directory directory:mariadb-backup-full
   key pid_file my-cnf-parameters:pid-file
   key binlog_path my-cnf-parameters:binlog-path

stack/erp5/instance.cfg.in

@@ -141,6 +141,7 @@ gzip-location = {{ gzip_location }}
 mariadb-location = {{ mariadb_location }}
 template-my-cnf = {{ template_my_cnf }}
 template-mariadb-initial-setup = {{ template_mariadb_initial_setup }}
+template-mysqld-wrapper = {{ template_mysqld_wrapper }}
 link-binary = {{ dumps(mariadb_link_binary) }}
 mariadb-resiliency-after-import-script = {{ mariadb_resiliency_after_import_script }}
 mariadb-slow-query-report-script = {{ mariadb_slow_query_report_script }}