From dbdc7cc33b97262e23ae6c47f30524a91c2fec50 Mon Sep 17 00:00:00 2001
From: Povilas Vaitkus <povilas.vaitkus@hostinger.com>
Date: Mon, 6 Nov 2023 16:24:49 +0200
Subject: [PATCH] Fix cluster settings

---
 metadata.rb                  | 2 +-
 templates/my.cnf.cluster.erb | 7 -------
 templates/my.cnf.main.erb    | 2 ++
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index c2f54f30..2715846a 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -5,7 +5,7 @@
 description       'Installs Percona MySQL client and server'
 source_url        'https://github.com/hostinger/chef-percona'
 issues_url        'https://github.com/hostinger/chef-percona/issues'
-version           '5.11.23'
+version           '5.11.24'
 chef_version      '>= 16.0'
 
 depends 'yum'
diff --git a/templates/my.cnf.cluster.erb b/templates/my.cnf.cluster.erb
index 677f0f0d..88db342b 100644
--- a/templates/my.cnf.cluster.erb
+++ b/templates/my.cnf.cluster.erb
@@ -387,13 +387,6 @@ binlog-do-db     = <%= db_name %>
 binlog-ignore-db = <%= db_name %>
 <% end -%>
 
-<%- if node["percona"]["version"].to_f >= 5.6 %>
-gtid_mode = <%= node["percona"]["server"]["gtid_mode"] %>
-<% if node["percona"]["server"]["enforce_gtid_consistency"] %>
-enforce_gtid_consistency = <%= node["percona"]["server"]["enforce_gtid_consistency"] %>
-<% end %>
-<% end %>
-
 <% if node["percona"]["server"]["sync_master_info"] %>
 sync_master_info = <%= node["percona"]["server"]["sync_master_info"] %>
 <% end %>
diff --git a/templates/my.cnf.main.erb b/templates/my.cnf.main.erb
index 2175a89e..3c4a6434 100644
--- a/templates/my.cnf.main.erb
+++ b/templates/my.cnf.main.erb
@@ -334,6 +334,8 @@ read_only
 skip-slave-start
 <% end %>
 
+slave_exec_mode = <%= node["percona"]["server"]["replication"]["slave_exec_mode"] %>
+
 # Number of times the replica SQL thread will retry a transaction in case it
 # failed with a deadlock or elapsed lock wait timeout, before giving up and
 # stopping.