Refresh MySQL 8.x config

Author: AaronFeledy

.github/workflows/pr-drupal-tests.yml

@@ -29,6 +29,7 @@ jobs:
           - examples/drupal10-mysql8
           - examples/drupal10-nginx
           - examples/drupal11
+          - examples/drupal11-mysql84
           - examples/drupal11-nginx
         lando-version:
           - 3-edge

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+* Updated MySQL config for better MySQL 8.4 support.
 * Added default config values to the `.lando.yml` file after init.
 * Removed `semver` dependency from the plugin.
 

builders/_drupaly.js

@@ -146,7 +146,7 @@ const getServices = options => ({
   },
   database: {
     config: getServiceConfig(options, ['database']),
-    authentication: 'mysql_native_password',
+    authentication: '',
     type: `drupal-${options.database}`,
     portforward: true,
     creds: {
@@ -165,20 +165,20 @@ const getDbTooling = (database, options) => {
   const [db, ver] = database.split(':');
   // Choose wisely
   if (db === 'mysql') {
-    return { mysql: mysqlCli };
+    return {mysql: mysqlCli};
   } else if (db === 'mariadb' && semver.lt(semver.coerce(ver), '10.4.0')) {
     // Use mysql command for MariaDB 10.3.x and below
-    return { mysql: mysqlCli };
+    return {mysql: mysqlCli};
   } else if (db === 'mariadb') {
-    return { mariadb: mariadbCli };
+    return {mariadb: mariadbCli};
   } else if (db === 'postgres') {
-    return { psql: postgresCli };
+    return {psql: postgresCli};
   } else if (db === 'mongo') {
     return {
       mongo: {
         service: 'database',
         description: 'Drop into the mongo shell',
-      }
+      },
     };
   }
 };
@@ -192,7 +192,7 @@ const getProxy = (options, proxyService = 'appserver') => {
   // add
   urls.push(`${options.app}.${options._app._config.domain}`);
   // return
-  return { [proxyService]: _.uniq(_.compact(urls)) };
+  return {[proxyService]: _.uniq(_.compact(urls))};
 };
 
 /*
@@ -236,7 +236,7 @@ module.exports = {
     tooling: {
       drush: {
         service: 'appserver',
-      }
+      },
     },
     via: 'apache:2.4',
     webroot: '.',
@@ -275,8 +275,8 @@ module.exports = {
               SIMPLETEST_BASE_URL: (options.via === 'nginx') ? 'https://appserver_nginx' : 'https://appserver',
               SIMPLETEST_DB: `mysql://${options.recipe}:${options.recipe}@database/${options.recipe}`,
             },
-          }
-        }
+          },
+        },
       });
 
       // Switch the proxy service if needed

builders/drupal-mariadb.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoMariadb = require('./../node_modules/@lando/mariadb/builders/mariadb.js');
+const LandoMariadb = require('@lando/mariadb/builders/mariadb.js');
 
 // Builder
 module.exports = {

builders/drupal-mssql.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoMssql = require('./../node_modules/@lando/mssql/builders/mssql.js');
+const LandoMssql = require('@lando/mssql/builders/mssql.js');
 
 // Builder
 module.exports = {

builders/drupal-mysql.js

@@ -1,14 +1,21 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoMysql = require('./../node_modules/@lando/mysql/builders/mysql.js');
+const LandoMysql = require('@lando/mysql/builders/mysql.js');
 
 // Builder
 module.exports = {
   name: 'drupal-mysql',
   parent: '_service',
   builder: parent => class DrupalMysql extends LandoMysql.builder(parent, LandoMysql.config) {
     constructor(id, options = {}) {
+      const semver = options._app._lando.utils.getSemver();
+
+      // Versions of MySQL prior to 8.0 use mysql_native_password authentication
+      if (!options.authentication && semver.lt(semver.coerce(options.version), '8.0.0')) {
+        options.authentication = 'mysql_native_password';
+      }
+
       super(id, options, {services: _.set({}, options.name)});
     }
   },

builders/drupal-php.js

@@ -1,8 +1,6 @@
 'use strict';
 
-const path = require('path');
-const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php');
-const LandoPhp = require(`${landoPhpPath}/builders/php.js`);
+const LandoPhp = require('@lando/php/builders/php.js');
 
 /**
  * Drupal PHP builder class that extends Lando PHP builder.

builders/drupal-postgres.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const LandoPostgres = require('./../node_modules/@lando/postgres/builders/postgres.js');
+const LandoPostgres = require('@lando/postgres/builders/postgres.js');
 
 // Builder
 module.exports = {

config/drupal11/mysql8.cnf

@@ -3,104 +3,55 @@
 #
 # LANDODRUPALMYSQL8CNF
 
-[mysqld]
-#
-# * Basic Settings
-#
-# Data is stored in a volume on the db container /sql
-default-storage-engine = innodb
+[server]
+# Basic settings
+mysql_native_password=ON
 
-#
-# * Fine Tuning
-#
-key_buffer_size    = 384M
-max_allowed_packet  = 32M
-thread_stack    = 400K
-thread_cache_size       = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-read_rnd_buffer_size = 8M
-myisam_sort_buffer_size = 64M
-table_open_cache = 512
-sort_buffer_size = 2M
+# Character sets and SQL mode
+character_set_server = utf8mb4
+collation_server = utf8mb4_general_ci
+sql_mode = ONLY_FULL_GROUP_BY,TRADITIONAL
+
+# Basic Tuning.
+max_connections = 500
+connect_timeout = 5
+wait_timeout = 28800
+max_allowed_packet = 32M
+thread_cache_size = 128
+sort_buffer_size = 4M
+bulk_insert_buffer_size = 16M
+tmp_table_size = 32M
+max_heap_table_size = 32M
+
+# MyISAM.
+myisam_recover_options = BACKUP
+key_buffer_size = 128M
+table_open_cache = 400
+myisam_sort_buffer_size = 512M
+concurrent_insert = 2
 read_buffer_size = 2M
+read_rnd_buffer_size = 1M
 
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file        = /src/.lando/log/mysql.log
-#general_log             = 1
-#
-# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
-#
-# Here you can see queries with especially long duration
-#log_slow_queries = /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
-#
-# The following can be used as easy to replay backup logs or for replication.
-# note: if you are setting up a replication slave, see README.Debian about
-#       other settings you may need to change.
-#server-id    = 1
-#log_bin      = /src/.lando/log/mysql-bin.log
-expire_logs_days = 10
-max_binlog_size = 101M
-#binlog_do_db   = include_database_name
-#binlog_ignore_db = include_database_name
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-#
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
-#innodb_log_group_home_dir = C:\mysql\data/
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 384M
-#innodb_additional_mem_pool_size = 20M
-# Set .._log_file_size to 25 % of buffer pool size
-innodb_log_file_size = 100M
-#innodb_log_buffer_size = 8M
-innodb_flush_log_at_trx_commit = 0
-#innodb_lock_wait_timeout = 50
+# InnoDB.
+default_storage_engine = InnoDB
 innodb_buffer_pool_size = 384M
-innodb_log_buffer_size  = 4M
-innodb_file_per_table   = 1
-innodb_open_files       = 256
-innodb_io_capacity      = 512
-innodb_flush_method     = O_DIRECT
-innodb_thread_concurrency = 8
+innodb_log_buffer_size = 8M
+innodb_file_per_table = 1
+innodb_open_files = 400
+innodb_io_capacity = 512
+innodb_thread_concurrency = 0
+innodb_read_io_threads = 16
+innodb_write_io_threads = 16
+innodb_flush_log_at_trx_commit = 0
+innodb_max_dirty_pages_pct = 70
+innodb_adaptive_hash_index = 0
+innodb_use_native_aio = 0
 innodb_lock_wait_timeout = 127
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-# chroot = /var/lib/mysql/
-#
-# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
-#
-# ssl-ca=/etc/mysql/cacert.pem
-# ssl-cert=/etc/mysql/server-cert.pem
-# ssl-key=/etc/mysql/server-key.pem
+
+[client]
+default_character_set=utf8mb4
+max_allowed_packet = 64M
 
 [mysqldump]
 quick
 quote-names
-max_allowed_packet  = 32M
-
-[mysql]
-#no-auto-rehash # faster start of mysql but no tab completion
-
-[isamchk]
-key_buffer_size = 384M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M

examples/drupal-nginx/.lando.yml

@@ -5,7 +5,6 @@ config:
   webroot: web
   php: 7.4
 
-
 tooling:
   nginx:
     service: appserver_nginx