From f240cc916f2104ea6836437672e347a95b8014ab Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 11 Aug 2021 18:53:15 +0100
Subject: [PATCH] Partial Revert "Bump MariaDB version to 10.5.9"

This revert removes the workarounds needed for 10.5.9 due to
root user losing ability to grant privs.

This reverts commit 1db0ef2efbd22b3491e1cf57e172a3d87b6f62a9.

Change-Id: Ia8881d0c247fc53ed24836eaa11fc5b5243f9e3f
---
 handlers/galera_upgrade_hook.yml | 39 --------------------------------
 handlers/main.yml                | 10 --------
 2 files changed, 49 deletions(-)
 delete mode 100644 handlers/galera_upgrade_hook.yml

diff --git a/handlers/galera_upgrade_hook.yml b/handlers/galera_upgrade_hook.yml
deleted file mode 100644
index eb32ec56..00000000
--- a/handlers/galera_upgrade_hook.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-# Copyright 2021, City Network International AB
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Start mysql_safe instance
-  command: mariadbd-safe --skip-grant-tables --skip-networking
-  async: 300
-  poll: 0
-
-- name: Get current root permissions
-  community.mysql.mysql_query:
-    login_unix_socket: "{{ galera_unix_socket }}"
-    query: select Priv from mysql.global_priv where User = 'root' and Host = 'localhost'
-  retries: 10
-  delay: 2
-  register: maria_root_priv
-  until: maria_root_priv is success
-
-- name: Fixing root access permissions
-  community.mysql.mysql_query:
-    login_unix_socket: "{{ galera_unix_socket }}"
-    query: UPDATE mysql.global_priv SET Priv = %(priv)s where User = 'root' and Host = 'localhost'
-    named_args:
-      priv: "{{ maria_root_priv['query_result'][0][0]['Priv'] | replace('274877906943', '549755813887') | string }}"
-  when: "'549755813887' not in maria_root_priv['query_result'][0][0]['Priv']"
-
-- name: Stop mysql_safe
-  command: mysql -e shutdown
diff --git a/handlers/main.yml b/handlers/main.yml
index 67736b87..1deb13df 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -59,16 +59,6 @@
     - galera_install_server | bool
     - not galera_cluster_ready | bool
 
-# TODO: Remove this include once MariaDB bug will be resolved
-# https://jira.mariadb.org/browse/MDEV-25030
-- name: Fix root user permissions during upgrade
-  include_tasks: handlers/galera_upgrade_hook.yml
-  listen: Bootstrap cluster
-  when:
-    - galera_install_server | bool
-    - galera_upgrade | bool
-    - inventory_hostname == galera_server_bootstrap_node
-
 - name: Start new cluster
   command: /usr/local/bin/galera_new_cluster
   failed_when: not start_new_cluster.rc in [0, 3]