From 72bd0b6e2a798c6d38c79fd58d6bac1dc744131d Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 3 Aug 2021 09:08:08 -0700 Subject: [PATCH] Use the mariadb jdbc connector in gerrit Upstream stable-3.2 and stable-3.3 branches have been fixed to allow us to use the mariadb jdbc connector. The previous change has updated our images to ensure they include this fix. We can now update the config to use the mariadb connector. Change-Id: I43ac20d601ff88e42f0d20387fc6ad8842ab8244 --- playbooks/roles/gerrit/templates/secure.config.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/playbooks/roles/gerrit/templates/secure.config.j2 b/playbooks/roles/gerrit/templates/secure.config.j2 index 88d7a64742..dc0ed39b94 100644 --- a/playbooks/roles/gerrit/templates/secure.config.j2 +++ b/playbooks/roles/gerrit/templates/secure.config.j2 @@ -4,10 +4,7 @@ {% endif %} {% if gerrit_reviewdb_database_type == 'mariadb_container' %} [accountPatchReviewDb] -# NOTE(ianw) 2021-07-19 : the mariadb connector throws errors because -# it doesn't seem to handle duplicate key detection. Investigation -# upstream TBC. - url = jdbc:mysql://127.0.0.1:3306/{{ gerrit_reviewdb_mariadb_dbname }}?sessionVariables=character_set_client=utf8,character_set_results=utf8,character_set_connection=utf8,collation_connection=utf8_unicode_ci,collation_database=utf8_unicode_ci,collation_server=utf8_unicode_ci&user={{ gerrit_reviewdb_mariadb_username }}&password={{ gerrit_reviewdb_mariadb_password }} + url = jdbc:mariadb://127.0.0.1:3306/{{ gerrit_reviewdb_mariadb_dbname }}?sessionVariables=character_set_client=utf8,character_set_results=utf8,character_set_connection=utf8,collation_connection=utf8_unicode_ci,collation_database=utf8_unicode_ci,collation_server=utf8_unicode_ci&user={{ gerrit_reviewdb_mariadb_username }}&password={{ gerrit_reviewdb_mariadb_password }} {% endif %} [auth] registerEmailPrivateKey = {{ gerrit_email_private_key }}