Fix MySQL Data Directory #589

tommaso-borgato · 2024-10-07T15:00:23Z

Fix issues-588 by setting the correct MySQL Data Directory;

Now you can use both the following images by setting the correct datadir:

xtf.mysql.image=registry.redhat.io/rhel9/mysql-80:latest
# the following value is the default value and can be omitted
xtf.mysql.datadir=/var/lib/mysql/data

or:

xtf.mysql.image=container-registry.oracle.com/mysql/community-server:8.0
xtf.mysql.datadir=/var/lib/mysql

Please make sure your PR meets the following requirements:

Pull Request contains a description of the changes
Pull Request does not include fixes for multiple issues/topics
Code is formatted, imports ordered, code compiles and tests are passing
Code is self-descriptive and/or documented

tommaso-borgato · 2024-10-07T15:03:21Z

CI Runs:

eap-8.x-openshift-4-wildfly-openjdk17/491/ run with container-registry.oracle.com/mysql/community-server:8.0
eap-8.x-openshift-4-wildfly-openjdk17/492/ run with registry.redhat.io/rhel9/mysql-80:1-330

simkam · 2024-10-07T15:29:35Z

I'm unsure about this. We might need two different implementations for RH and non-RH images. RH images are often (always?) different from community or official images. They are created for S2I and OpenShift, the other images are more generic.

mnovak · 2024-10-08T06:47:00Z

builder/src/main/java/cz/xtf/builder/db/MySQL.java

@@ -6,31 +6,31 @@
 public class MySQL extends AbstractSQLDatabase {

    public MySQL() {
-        super("MYSQL", "/var/lib/mysql/data");
+        super("MYSQL", "/var/lib/mysql");


Could we make it configurable through the property? Something like:

private static final String DATA_DIR_PROPERTY = "xtf.mysql.datadir"; private static final String MYSQL_DATA_DIR = System.getProperty(DATA_DIR_PROPERTY, "/var/lib/mysql/data"); ... public MySQL() { super("MYSQL", MYSQL_DATA_DIR); }

@mnovak1 Tnks! that's a smart idea ... I tried and implemented it: please have a look

It works with the oracle image (see eap-8.x-openshift-4-wildfly-openjdk17/502/)

It also works with Red Hat image (see eap-8.x-openshift-4-wildfly-openjdk17/504/)

In the end this PR would leave the current image setup unchanged, it would just add the option to customized the mount point for other MYSQL images:

Now you can use both images with:

xtf.mysql.image=registry.redhat.io/rhel9/mysql-80:latest # the following value is the default value and can be omitted xtf.mysql.datadir=/var/lib/mysql/data

or:

xtf.mysql.image=container-registry.oracle.com/mysql/community-server:8.0 xtf.mysql.datadir=/var/lib/mysql

tommaso-borgato · 2024-10-08T07:55:09Z

I'm unsure about this. We might need two different implementations for RH and non-RH images. RH images are often (always?) different from community or official images. They are created for S2I and OpenShift, the other images are more generic.

I just checked that RH image has /var/lib/mysql/data as tdathe default a dir while oracle image has /var/lib/mysql:

container-registry.oracle.com/mysql/community-server:8.0:

sh-5.1$ cd /var/lib/mysql/
sh-5.1$ ls -la
total 97744
-rw-r-----. 1 1000900000 root   196608 Oct  7 13:14 '#ib_16384_0.dblwr'
-rw-r-----. 1 1000900000 root  8585216 Oct  7 13:11 '#ib_16384_1.dblwr'
drwxr-x---. 2 1000900000 root     4096 Oct  7 13:12 '#innodb_redo'
drwxr-x---. 2 1000900000 root      187 Oct  7 13:11 '#innodb_temp'
drwxrwx---. 1 mysql      root     4096 Oct  7 13:12  .
drwxr-xr-x. 1 root       root       38 Jul 23 06:48  ..
-rw-r-----. 1 1000900000 root       56 Oct  7 13:11  auto.cnf
-rw-r-----. 1 1000900000 root      180 Oct  7 13:11  binlog.000001
-rw-r-----. 1 1000900000 root      362 Oct  7 13:12  binlog.000002
-rw-r-----. 1 1000900000 root       32 Oct  7 13:12  binlog.index
-rw-------. 1 1000900000 root     1705 Oct  7 13:11  ca-key.pem
-rw-r--r--. 1 1000900000 root     1112 Oct  7 13:11  ca.pem
-rw-r--r--. 1 1000900000 root     1112 Oct  7 13:11  client-cert.pem
-rw-------. 1 1000900000 root     1705 Oct  7 13:11  client-key.pem
-rw-r-----. 1 1000900000 root     5623 Oct  7 13:11  ib_buffer_pool
-rw-r-----. 1 1000900000 root 12582912 Oct  7 13:12  ibdata1
-rw-r-----. 1 1000900000 root 12582912 Oct  7 13:12  ibtmp1
drwxr-x---. 2 1000900000 root      143 Oct  7 13:11  mysql
-rw-r-----. 1 1000900000 root 32505856 Oct  7 13:12  mysql.ibd
srwxrwxrwx. 1 1000900000 root        0 Oct  7 13:12  mysql.sock
-rw-------. 1 1000900000 root        2 Oct  7 13:12  mysql.sock.lock
drwxr-x---. 2 1000900000 root     8192 Oct  7 13:11  performance_schema
-rw-------. 1 1000900000 root     1705 Oct  7 13:11  private_key.pem
-rw-r--r--. 1 1000900000 root      452 Oct  7 13:11  public_key.pem
-rw-r--r--. 1 1000900000 root     1112 Oct  7 13:11  server-cert.pem
-rw-------. 1 1000900000 root     1705 Oct  7 13:11  server-key.pem
drwxr-x---. 2 1000900000 root       28 Oct  7 13:11  sys
drwxr-x---. 2 1000900000 root        6 Oct  7 13:11  test
-rw-r-----. 1 1000900000 root 16777216 Oct  7 13:14  undo_001
-rw-r-----. 1 1000900000 root 16777216 Oct  7 13:14  undo_002

registry.redhat.io/rhel9/mysql-80:1-330:

sh-5.1$ cd /var/lib/mysql/
sh-5.1$ ls -la
total 12
drwxrwxr-x. 1 mysql      root  102 Oct  7 13:07 .
drwxr-xr-x. 1 root       root   19 Aug 28 12:56 ..
drwxrwxr-x. 1 mysql      root 4096 Oct  7 13:07 data
srwxrwxrwx. 1 1000900000 root    0 Oct  7 13:07 mysql.sock
-rw-------. 1 1000900000 root    2 Oct  7 13:07 mysql.sock.lock
srwxrwxrwx. 1 1000900000 root    0 Oct  7 13:07 mysqlx.sock
-rw-------. 1 1000900000 root    2 Oct  7 13:07 mysqlx.sock.lock

$ ls -la data
total 91600
-rw-r-----. 1 1000900000 root   196608 Oct  7 13:09 '#ib_16384_0.dblwr'
-rw-r-----. 1 1000900000 root  8585216 Oct  7 13:07 '#ib_16384_1.dblwr'
drwxr-x---. 2 1000900000 root     4096 Oct  7 13:07 '#innodb_redo'
drwxr-x---. 2 1000900000 root      187 Oct  7 13:07 '#innodb_temp'
drwxrwxr-x. 1 mysql      root     4096 Oct  7 13:07  .
drwxrwxr-x. 1 mysql      root      102 Oct  7 13:07  ..
-rw-r-----. 1 1000900000 root       56 Oct  7 13:07  auto.cnf
-rw-r-----. 1 1000900000 root     2138 Oct  7 13:07  binlog.000001
-rw-r-----. 1 1000900000 root      157 Oct  7 13:07  binlog.000002
-rw-r-----. 1 1000900000 root       32 Oct  7 13:07  binlog.index
-rw-------. 1 1000900000 root     1705 Oct  7 13:07  ca-key.pem
-rw-r--r--. 1 1000900000 root     1112 Oct  7 13:07  ca.pem
-rw-r--r--. 1 1000900000 root     1112 Oct  7 13:07  client-cert.pem
-rw-------. 1 1000900000 root     1705 Oct  7 13:07  client-key.pem
-rw-r-----. 1 1000900000 root     3739 Oct  7 13:07  ib_buffer_pool
-rw-r-----. 1 1000900000 root 12582912 Oct  7 13:07  ibdata1
-rw-r-----. 1 1000900000 root 12582912 Oct  7 13:07  ibtmp1
drwxr-x---. 2 1000900000 root      143 Oct  7 13:07  mysql
-rw-r-----. 1 1000900000 root        2 Oct  7 13:07  mysql-80-65bc4d4f46-7sdwz.pid
-rw-r-----. 1 1000900000 root 26214400 Oct  7 13:07  mysql.ibd
-rw-r--r--. 1 1000900000 root        7 Oct  7 13:07  mysql_upgrade_info
drwxr-x---. 2 1000900000 root     8192 Oct  7 13:07  performance_schema
-rw-------. 1 1000900000 root     1705 Oct  7 13:07  private_key.pem
-rw-r--r--. 1 1000900000 root      452 Oct  7 13:07  public_key.pem
-rw-r--r--. 1 1000900000 root     1112 Oct  7 13:07  server-cert.pem
-rw-------. 1 1000900000 root     1705 Oct  7 13:07  server-key.pem
drwxr-x---. 2 1000900000 root       28 Oct  7 13:07  sys
drwxr-x---. 2 1000900000 root        6 Oct  7 13:07  test
-rw-r-----. 1 1000900000 root 16777216 Oct  7 13:09  undo_001
-rw-r-----. 1 1000900000 root 16777216 Oct  7 13:09  undo_002

mnovak · 2024-10-08T11:22:52Z

builder/src/main/java/cz/xtf/builder/db/MySQL.java

 import cz.xtf.core.image.Image;

 public class MySQL extends AbstractSQLDatabase {

    public MySQL() {
-        super("MYSQL", "/var/lib/mysql/data");
+        super("MYSQL", XTFConfig.get("xtf.mysql.datadir", "/var/lib/mysql/data"));


Could you move those into the constant like:

private static final String DATA_DIR_PROPERTY = "xtf.mysql.datadir"; private static final String MYSQL_DATA_DIR = XTFConfig.get(DATA_DIR_PROPERTY, "/var/lib/mysql/data");

and use MYSQL_DATA_DIR here, please?

@mnovak1 this way the value would be loaded all the times, not just at object creation, is that ok?

I moved the string values to constants at present, leaving retrieval in the constructor ....

@mnovak1 this way the value would be loaded all the times, not just at object creation, is that ok?

Actually I would resign on this and use my way :-) the problem is that you need to call XTFConfig.loadConfig() anytime you want to load updated system properties. So above will not help unless XTFConfig.loadConfig() is called before from the test code.

@mnovak1 thank you! done

@mnovak1 I just verified it works with Red Hat image (see eap-8.x-openshift-4-wildfly-openjdk17/505)

mnovak

LGTM

tommaso-borgato requested a review from laDok8 October 7, 2024 15:02

tommaso-borgato mentioned this pull request Oct 7, 2024

Wrong MySQL Data Directory #588

Closed

mnovak reviewed Oct 8, 2024

View reviewed changes

tommaso-borgato force-pushed the issues-588 branch from 438a017 to 316a2aa Compare October 8, 2024 08:50

mnovak reviewed Oct 8, 2024

View reviewed changes

tommaso-borgato force-pushed the issues-588 branch from 316a2aa to 89eb07e Compare October 8, 2024 11:32

Fix MySQL Data Directory

4ce2863

tommaso-borgato force-pushed the issues-588 branch from 89eb07e to 4ce2863 Compare October 8, 2024 11:43

mnovak approved these changes Oct 8, 2024

View reviewed changes

mnovak merged commit 69ea28e into master Oct 8, 2024
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix MySQL Data Directory #589

Fix MySQL Data Directory #589

tommaso-borgato commented Oct 7, 2024 •

edited

Loading

tommaso-borgato commented Oct 7, 2024 •

edited

Loading

simkam commented Oct 7, 2024

mnovak Oct 8, 2024

tommaso-borgato Oct 8, 2024

tommaso-borgato Oct 8, 2024

tommaso-borgato Oct 8, 2024

tommaso-borgato Oct 8, 2024 •

edited

Loading

tommaso-borgato commented Oct 8, 2024 •

edited

Loading

mnovak Oct 8, 2024

tommaso-borgato Oct 8, 2024 •

edited

Loading

mnovak Oct 8, 2024

tommaso-borgato Oct 8, 2024

tommaso-borgato Oct 8, 2024

mnovak left a comment

Fix MySQL Data Directory #589

Fix MySQL Data Directory #589

Conversation

tommaso-borgato commented Oct 7, 2024 • edited Loading

tommaso-borgato commented Oct 7, 2024 • edited Loading

simkam commented Oct 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tommaso-borgato Oct 8, 2024 • edited Loading

Choose a reason for hiding this comment

tommaso-borgato commented Oct 8, 2024 • edited Loading

container-registry.oracle.com/mysql/community-server:8.0:

registry.redhat.io/rhel9/mysql-80:1-330:

Choose a reason for hiding this comment

tommaso-borgato Oct 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mnovak left a comment

Choose a reason for hiding this comment

tommaso-borgato commented Oct 7, 2024 •

edited

Loading

tommaso-borgato commented Oct 7, 2024 •

edited

Loading

tommaso-borgato Oct 8, 2024 •

edited

Loading

tommaso-borgato commented Oct 8, 2024 •

edited

Loading

tommaso-borgato Oct 8, 2024 •

edited

Loading