From 27dd69a7f6ba34d1fb078256fe597572ff8d1330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sun, 26 Sep 2021 13:47:14 +0000
Subject: [PATCH] [mariadb] Drop some old workaround
innodb_lock_schedule_algorithm setting is removed in MariaDB 10.6.
Change-Id: I1ff06162569c46c51847b4c31933861549787c65
Depends-On: https://review.opendev.org/c/openstack/kolla/+/811014
---
ansible/roles/mariadb/templates/galera.cnf.j2 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index f0a0474f59..6c038a65e1 100644
--- a/ansible/roles/mariadb/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -57,11 +57,6 @@ innodb_buffer_pool_size = '{{ dynamic_pool_size_mb }}M'
innodb_buffer_pool_size = '8192M'
{% endif %}
-# The default value for innodb_lock_schedule_algorithm is VATS, but this does
-# not work with galera. Set FCFS explicitly to avoid a warning.
-# https://mariadb.com/kb/en/library/innodb-system-variables/#innodb_lock_schedule_algorithm.
-innodb_lock_schedule_algorithm = FCFS
-
[server]
pid-file=/var/lib/mysql/mariadb.pid