Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support MariaDB 10.11 #223

Merged
merged 8 commits into from
Feb 26, 2024
Merged

Conversation

phracek
Copy link
Member

@phracek phracek commented Jan 10, 2024

Support MariaDB 10.11 for building, testing, and pushing to Quay.io.

The pull request is separated to more commits.

  1. git move 10.5 -> 10.11
  2. copy sources back to 10.11->10.5
  3. Make changes in 10.11 directory to support 10.11
  4. Add build an push to quay.io

@phracek phracek marked this pull request as draft January 10, 2024 08:50
@phracek
Copy link
Member Author

phracek commented Jan 22, 2024

[test]

@phracek phracek marked this pull request as ready for review January 23, 2024 13:56
@phracek phracek force-pushed the support_building_testing_pushing_1011 branch from 268709b to d752c16 Compare January 23, 2024 14:02
@phracek
Copy link
Member Author

phracek commented Jan 23, 2024

[test]

2 similar comments
@phracek
Copy link
Member Author

phracek commented Jan 23, 2024

[test]

@phracek
Copy link
Member Author

phracek commented Feb 5, 2024

[test]

@zmiklank
Copy link
Contributor

zmiklank commented Feb 5, 2024

f40 mariadb10.11 is already in bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-fd6c145765

@zmiklank
Copy link
Contributor

zmiklank commented Feb 5, 2024

It will no longer be modular, so this PR would need to be adjusted accordingly, when the rpms are out.

@phracek
Copy link
Member Author

phracek commented Feb 8, 2024

[test]

@phracek
Copy link
Member Author

phracek commented Feb 12, 2024

f40 mariadb10.11 is already in bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2024-fd6c145765

Because of mariadb10.11 is not yet in branch f40. Do not test mariadb10.11 on Fedora.

@phracek
Copy link
Member Author

phracek commented Feb 12, 2024

[test]

@phracek
Copy link
Member Author

phracek commented Feb 12, 2024

RHEL8 and RHEL9 tests are failing:

==============================================
Tests were run for image rhel8/mariadb-1011:1
==============================================
Test cases results:

 [PASSED] for 'appnamenotset' run_container_creation_tests (00:00:10)
 [PASSED] for 'appnamenotset' run_configuration_tests (00:00:17)
 [PASSED] for 'appnamenotset' run_general_tests (00:01:01)
 [PASSED] for 'appnamenotset' run_change_password_test (00:00:13)
 [PASSED] for 'appnamenotset' run_change_password_new_user_test (00:00:12)
 [PASSED] for 'appnamenotset' run_replication_test (00:00:11)
 [PASSED] for 'appnamenotset' run_doc_test (00:00:01)
 [PASSED] for 'appnamenotset' run_s2i_test (00:00:23)
 [PASSED] for 'appnamenotset' run_ssl_test (00:00:08)
 [FAILED] for 'appnamenotset' run_upgrade_test (00:00:19)

Failed test is here:

-----------------------------------------------
Running test run_upgrade_test (starting at 2024-02-12 09:18:36-05:00) ... 
-----------------------------------------------
  Testing upgrade of the container image
    Created container 79b33a69f92114191ea8c1c5ed1c5ca6345c1664c61c3696d08b729b51a8a54a
  Testing MySQL connection to 10.88.0.131...
    Trying to connect...... OK
  Success!
  Testing upgrade from data without version
    Created container 4b5a8d31c2307e538609319a76a34c2d9fbcea2b5a65a4db1f295df0bc81c506
  Testing MySQL connection to 10.88.0.135...
    Trying to connect..... OK
  Success!
  Testing upgrade from too old data
  Success!
  Testing upgrade from previous version
    Created container 7a79a49ccf0f714c45668d7f3bc8f6c5646307c09afffed531392c3f73432073
  Testing MySQL connection to 10.88.0.139...
    Trying to connect..... OK
  Success!
Upgrade did not happen but it should when upgrading from previous version
=> sourcing 20-validate-variables.sh ...
=> sourcing 25-validate-replication-variables.sh ...
=> sourcing 30-base-config.sh ...
---> 14:18:50     Processing basic MySQL configuration files ...
=> sourcing 60-replication-config.sh ...
=> sourcing 70-s2i-config.sh ...
---> 14:18:50     Processing additional arbitrary  MySQL configuration provided by s2i ...
=> sourcing 40-paas.cnf ...
=> sourcing 50-my-tuning.cnf ...
---> 14:18:50     Starting MySQL server with disabled networking ...
---> 14:18:50     Waiting for MySQL to start ...
2024-02-12 14:18:50 0 [Note] Starting MariaDB 10.11.6-MariaDB source revision fecd78b83785d5ae96f2c6ff340375be803cd299 as process 26
2024-02-12 14:18:51 0 [Note] InnoDB: Compressed tables use zlib 1.2.11
2024-02-12 14:18:51 0 [Note] InnoDB: Number of transaction pools: 1
2024-02-12 14:18:51 0 [Note] InnoDB: Using crc32 + pclmulqdq instructions
2024-02-12 14:18:51 0 [Note] mysqld: O_TMPFILE is not supported on /var/tmp (disabling future attempts)
2024-02-12 14:18:51 0 [Note] InnoDB: Using Linux native AIO
2024-02-12 14:18:51 0 [Note] InnoDB: Initializing buffer pool, total size = 5.000MiB, chunk size = 1.000MiB
2024-02-12 14:18:51 0 [Note] InnoDB: Completed initialization of buffer pool
2024-02-12 14:18:51 0 [Note] InnoDB: Buffered log writes (block size=512 bytes)
2024-02-12 14:18:51 0 [Note] InnoDB: End of log at LSN=46980
2024-02-12 14:18:51 0 [Note] InnoDB: 128 rollback segments are active.
2024-02-12 14:18:51 0 [Note] InnoDB: Removed temporary tablespace data file: "./ibtmp1"
2024-02-12 14:18:51 0 [Note] InnoDB: Setting file './ibtmp1' size to 12.000MiB. Physically writing the file full; Please wait ...
2024-02-12 14:18:51 0 [Note] InnoDB: File './ibtmp1' size is now 12.000MiB.
2024-02-12 14:18:51 0 [Note] InnoDB: log sequence number 46980; transaction id 14
2024-02-12 14:18:51 0 [Note] Plugin 'FEEDBACK' is disabled.
2024-02-12 14:18:51 0 [Note] InnoDB: Loading buffer pool(s) from /var/lib/mysql/data/ib_buffer_pool
2024-02-12 14:18:51 0 [Warning] 'user' entry 'root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:51 0 [Warning] 'proxies_priv' entry '@% root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:51 0 [Note] /usr/libexec/mysqld: ready for connections.
Version: '10.11.6-MariaDB'  socket: '/tmp/mysql.sock'  port: 0  MariaDB Server
2024-02-12 14:18:51 0 [Note] InnoDB: Buffer pool(s) load completed at 240212 14:18:51
---> 14:18:51     MySQL started successfully
=> sourcing 40-datadir-action.sh ...
---> 14:18:52     Running datadir action: upgrade-auto
---> 14:18:52     Warning: Version of the data could not be determined. It is because the file mysql_upgrade_info is missing in the data directory, which is most probably because it was not created when initialization of data directory. In order to allow seamless updates to the next higher version in the future, the file mysql_upgrade_info will be created. If the data directory was created with a different version than 10.11, it is required to run this container with the MYSQL_DATADIR_ACTION environment variable set to 'force', or run 'mysql_upgrade' utility manually; the mysql_upgrade tool checks the tables and creates such a file as well. For upstream documentation about upgrading, see: Non expected version '10.11'
File /var/lib/mysql/data/mysql_upgrade_info exists, nothing is done.
=> sourcing 50-passwd-change.sh ...
---> 14:18:52     Setting passwords ...
2024-02-12 14:18:52 6 [Warning] 'user' entry 'root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:52 6 [Warning] 'proxies_priv' entry '@% root@79b33a69f921' ignored in --skip-name-resolve mode.
---> 14:18:52     Shutting down MySQL ...
2024-02-12 14:18:52 7 [Warning] 'user' entry 'root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:52 7 [Warning] 'proxies_priv' entry '@% root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:52 0 [Note] /usr/libexec/mysqld (initiated by: root[root] @ localhost []): Normal shutdown
2024-02-12 14:18:52 0 [Note] InnoDB: FTS optimize thread exiting.
2024-02-12 14:18:52 0 [Note] InnoDB: Starting shutdown...
2024-02-12 14:18:52 0 [Note] InnoDB: Dumping buffer pool(s) to /var/lib/mysql/data/ib_buffer_pool
2024-02-12 14:18:52 0 [Note] InnoDB: Restricted to 78 pages due to innodb_buf_pool_dump_pct=25
2024-02-12 14:18:52 0 [Note] InnoDB: Buffer pool(s) dump completed at 240212 14:18:52
2024-02-12 14:18:52 0 [Note] InnoDB: Removed temporary tablespace data file: "./ibtmp1"
2024-02-12 14:18:52 0 [Note] InnoDB: Shutdown completed; log sequence number 46980; transaction id 15
2024-02-12 14:18:52 0 [Note] /usr/libexec/mysqld: Shutdown complete

---> 14:18:53     Cleaning up environment variables MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE and MYSQL_ROOT_PASSWORD ...
---> 14:18:53     Running final exec -- Only MySQL server logs after this point
2024-02-12 14:18:53 0 [Note] Starting MariaDB 10.11.6-MariaDB source revision fecd78b83785d5ae96f2c6ff340375be803cd299 as process 1
2024-02-12 14:18:53 0 [Note] InnoDB: Compressed tables use zlib 1.2.11
2024-02-12 14:18:53 0 [Note] InnoDB: Number of transaction pools: 1
2024-02-12 14:18:53 0 [Note] InnoDB: Using crc32 + pclmulqdq instructions
2024-02-12 14:18:53 0 [Note] mysqld: O_TMPFILE is not supported on /var/tmp (disabling future attempts)
2024-02-12 14:18:53 0 [Note] InnoDB: Using Linux native AIO
2024-02-12 14:18:53 0 [Note] InnoDB: Initializing buffer pool, total size = 5.000MiB, chunk size = 1.000MiB
2024-02-12 14:18:53 0 [Note] InnoDB: Completed initialization of buffer pool
2024-02-12 14:18:53 0 [Note] InnoDB: Buffered log writes (block size=512 bytes)
2024-02-12 14:18:53 0 [Note] InnoDB: End of log at LSN=46980
2024-02-12 14:18:53 0 [Note] InnoDB: 128 rollback segments are active.
2024-02-12 14:18:53 0 [Note] InnoDB: Setting file './ibtmp1' size to 12.000MiB. Physically writing the file full; Please wait ...
2024-02-12 14:18:53 0 [Note] InnoDB: File './ibtmp1' size is now 12.000MiB.
2024-02-12 14:18:53 0 [Note] InnoDB: log sequence number 46980; transaction id 14
2024-02-12 14:18:53 0 [Note] InnoDB: Loading buffer pool(s) from /var/lib/mysql/data/ib_buffer_pool
2024-02-12 14:18:53 0 [Note] Plugin 'FEEDBACK' is disabled.
2024-02-12 14:18:53 0 [Note] Server socket created on IP: '0.0.0.0'.
2024-02-12 14:18:53 0 [Note] Server socket created on IP: '::'.
2024-02-12 14:18:53 0 [Warning] 'user' entry 'root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:53 0 [Warning] 'proxies_priv' entry '@% root@79b33a69f921' ignored in --skip-name-resolve mode.
2024-02-12 14:18:53 0 [Note] /usr/libexec/mysqld: ready for connections.
Version: '10.11.6-MariaDB'  socket: '/var/lib/mysql/mysql.sock'  port: 3306  MariaDB Server
2024-02-12 14:18:53 0 [Note] InnoDB: Buffer pool(s) load completed at 240212 14:18:53
2024-02-12 14:18:54 0 [Note] /usr/libexec/mysqld (initiated by: unknown): Normal shutdown
2024-02-12 14:18:54 0 [Note] InnoDB: FTS optimize thread exiting.
2024-02-12 14:18:54 0 [Note] InnoDB: Starting shutdown...
2024-02-12 14:18:54 0 [Note] InnoDB: Dumping buffer pool(s) to /var/lib/mysql/data/ib_buffer_pool
2024-02-12 14:18:54 0 [Note] InnoDB: Restricted to 78 pages due to innodb_buf_pool_dump_pct=25
2024-02-12 14:18:54 0 [Note] InnoDB: Buffer pool(s) dump completed at 240212 14:18:54
2024-02-12 14:18:54 0 [Note] InnoDB: Removed temporary tablespace data file: "./ibtmp1"
2024-02-12 14:18:54 0 [Note] InnoDB: Shutdown completed; log sequence number 46980; transaction id 15
2024-02-12 14:18:54 0 [Note] /usr/libexec/mysqld: Shutdown complete

Test for image 'rhel8/mariadb-1011:1' FAILED (exit code: 1)
Tests finished with EXIT=0

10.11/Dockerfile Outdated Show resolved Hide resolved
10.11/Dockerfile.rhel7 Outdated Show resolved Hide resolved
@phracek
Copy link
Member Author

phracek commented Feb 13, 2024

[test]

@hhorak
Copy link
Member

hhorak commented Feb 13, 2024

There is a missing entry for 10.11 at https://github.com/sclorg/mariadb-container/blob/master/root-common/usr/share/container-scripts/mysql/init/40-datadir-action.sh#L8 -- it should likely include links to all versions between 10.5 and 10.11

@hhorak hhorak force-pushed the support_building_testing_pushing_1011 branch from 6b549a5 to f16ea18 Compare February 13, 2024 21:33
@hhorak
Copy link
Member

hhorak commented Feb 13, 2024

I've pushed an additional commit that should help fixing the upgrade.

@hhorak hhorak force-pushed the support_building_testing_pushing_1011 branch from f16ea18 to 447d6f4 Compare February 13, 2024 21:35
@hhorak
Copy link
Member

hhorak commented Feb 13, 2024

[test]

@phracek phracek force-pushed the support_building_testing_pushing_1011 branch from 447d6f4 to 8603271 Compare February 15, 2024 09:33
@phracek
Copy link
Member Author

phracek commented Feb 15, 2024

[test]

@zmiklank
Copy link
Contributor

Could you please squash the fix up commits before merging?

@phracek
Copy link
Member Author

phracek commented Feb 15, 2024

Definitely. But I would like to merge it as soon as all tests are passing.

@phracek phracek force-pushed the support_building_testing_pushing_1011 branch from 1a9aff3 to c6244f3 Compare February 15, 2024 11:27
Do not use modular based mariadb:10.11
Use proper version for 10.11/Dockerfile
Enable module for 10.11/Dockerfile.rhel9 and 10.11/Dockerfile.c9s
Version 10.11 is in scope for CentOS 7 and RHEL7.
Update 10.11/root/usr/share/container-scripts/mysql/README.md
@phracek phracek force-pushed the support_building_testing_pushing_1011 branch from c6244f3 to 3b4e42a Compare February 15, 2024 11:28
@phracek
Copy link
Member Author

phracek commented Feb 15, 2024

Rebased
[test]

@hhorak
Copy link
Member

hhorak commented Feb 20, 2024

The failure of 10.5 on RHEL-9 was likely caused by a wrong compose (mariadb 10.5 was missing), it seems to be fixed now, so re-running the tests.
[test]

@phracek
Copy link
Member Author

phracek commented Feb 21, 2024

[test]

@phracek
Copy link
Member Author

phracek commented Feb 22, 2024

[test-openshift]

@phracek
Copy link
Member Author

phracek commented Feb 22, 2024

[test]

imagestreams/mariadb-centos.json Outdated Show resolved Hide resolved
imagestreams/mariadb-centos.json Outdated Show resolved Hide resolved
@phracek phracek force-pushed the support_building_testing_pushing_1011 branch from 7970af1 to 2d92a6f Compare February 22, 2024 14:46
@phracek
Copy link
Member Author

phracek commented Feb 22, 2024

[test]

Copy link
Contributor

@zmiklank zmiklank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@phracek phracek merged commit 4d2ab28 into master Feb 26, 2024
12 checks passed
@phracek phracek deleted the support_building_testing_pushing_1011 branch February 26, 2024 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants