From f653ac6fb5d25b8fd3634e794dccca9a099c807b Mon Sep 17 00:00:00 2001 From: Lukas Juozas Janusaitis Date: Fri, 11 Aug 2023 15:33:48 +0300 Subject: [PATCH] Add wsrep_retry_autocommit variable to cluster template --- Berksfile.lock | 2 +- README.md | 3 ++- attributes/default.rb | 1 + metadata.rb | 2 +- templates/default/my.cnf.cluster.erb | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Berksfile.lock b/Berksfile.lock index 522ba6a7..d71fbc14 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -12,7 +12,7 @@ GRAPH mingw (2.1.8) seven_zip (>= 0.0.0) openssl (8.5.5) - percona (5.11.19) + percona (5.11.20) apt (>= 2.7.0) build-essential (>= 0.0.0) chef-vault (>= 0.0.0) diff --git a/README.md b/README.md index 57489e13..e8b50a5e 100644 --- a/README.md +++ b/README.md @@ -343,7 +343,7 @@ default["percona"]["server"]["binlog_ignore_db"] = [] default["percona"]["server"]["expire_logs_days"] = 10 default["percona"]["server"]["max_binlog_size"] = "100M" default["percona"]["server"]["binlog_cache_size"] = "1M" -default["percona"]["server"]["binlog_space_limit"] = 0 +default["percona"]["server"]["binlog_space_limit"] = 0 default["percona"]["server"]["binlog_format"] = "MIXED" default["percona"]["server"]["log_bin"] = "master-bin" default["percona"]["server"]["relay_log"] = "slave-relay-bin" @@ -413,6 +413,7 @@ default["percona"]["cluster"]["wsrep_provider"] = value_for_platform_family( "debian" => "/usr/lib/libgalera_smm.so", "rhel" => "/usr/lib64/libgalera_smm.so" ) +default["percona"]["cluster"]["wsrep_retry_autocommit"] = 1 default["percona"]["cluster"]["wsrep_provider_options"] = "" default["percona"]["cluster"]["wsrep_cluster_address"] = "" default["percona"]["cluster"]["wsrep_slave_threads"] = 2 diff --git a/attributes/default.rb b/attributes/default.rb index 876c4753..20fad103 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -201,6 +201,7 @@ "rhel" => "/usr/lib64/libgalera_smm.so" ) default["percona"]["cluster"]["wsrep_provider_options"] = "" +default['percona']['cluster']['wsrep_retry_autocommit'] = 1 default["percona"]["cluster"]["wsrep_cluster_address"] = "" default["percona"]["cluster"]["wsrep_slave_threads"] = 2 default["percona"]["cluster"]["wsrep_cluster_name"] = "" diff --git a/metadata.rb b/metadata.rb index 88cae178..e315bf9c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "MIT" description "Installs Percona MySQL client and server" long_description "Please refer to README.md" -version "5.11.19" +version "5.11.20" recipe "percona", "Includes the client recipe to configure a client" recipe "percona::package_repo", "Sets up the package repository and installs dependent packages" diff --git a/templates/default/my.cnf.cluster.erb b/templates/default/my.cnf.cluster.erb index b284650b..04be4487 100644 --- a/templates/default/my.cnf.cluster.erb +++ b/templates/default/my.cnf.cluster.erb @@ -78,6 +78,7 @@ wait_timeout = <%= node["percona"]["server"]["wait_timeout"] %> binlog_format = <%= node["percona"]["cluster"]["binlog_format"] %> wsrep_provider = <%= node["percona"]["cluster"]["wsrep_provider"] %> wsrep_provider_options = <%= node["percona"]["cluster"]["wsrep_provider_options"] %> +wsrep_retry_autocommit = <%= node["percona"]["cluster"]["wsrep_retry_autocommit"] %> wsrep_cluster_address = <%= node["percona"]["cluster"]["wsrep_cluster_address"] %> wsrep_slave_threads = <%= node["percona"]["cluster"]["wsrep_slave_threads"] %> wsrep_cluster_name = <%= node["percona"]["cluster"]["wsrep_cluster_name"] %>