From 214d0760ec5e8e208498af77ddb5131d9d4540af Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 18 Jun 2024 08:36:38 +0200 Subject: [PATCH 1/2] Revert "Wait for DB writes only on reads (causality checks)" This reverts commit b0747944394807862e4cdcfa7052f1f8d1febf94. --- templates/cinder/config/00-global-defaults.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/cinder/config/00-global-defaults.conf b/templates/cinder/config/00-global-defaults.conf index d9bd808b..09dcaeed 100644 --- a/templates/cinder/config/00-global-defaults.conf +++ b/templates/cinder/config/00-global-defaults.conf @@ -41,11 +41,10 @@ connection = {{ .DatabaseConnection }} max_retries = -1 db_max_retries = -1 -# Wait for writes to complete when doing reads -# Relevant for multi-master deployments so that workers table, and possibly -# other tables, work as intended +# Wait for writes to complete when doing a read, update, or insert +# Relevant for multi-master deployments so that workers table works as intended # https://mariadb.com/docs/server/ref/mdb/system-variables/wsrep_sync_wait/ -mysql_wsrep_sync_wait = 1 +mysql_wsrep_sync_wait = 7 [os_brick] lock_path = /var/locks/openstack/os-brick From 3bfd0d5c87c1be439f132b05aea743425554641b Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 18 Jun 2024 08:36:48 +0200 Subject: [PATCH 2/2] Revert "Wait for DB writes to propagate (causality checks)" This reverts commit 67b2877d6edeb6ed633c529afdc40f954714654b. The openstack-k8s-operators/mariadb-operator#229 switched the mariadb-operator to deploy in Active/Passive mode per default, instead of multimaster. --- templates/cinder/config/00-global-defaults.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/cinder/config/00-global-defaults.conf b/templates/cinder/config/00-global-defaults.conf index 09dcaeed..b9935da2 100644 --- a/templates/cinder/config/00-global-defaults.conf +++ b/templates/cinder/config/00-global-defaults.conf @@ -41,11 +41,6 @@ connection = {{ .DatabaseConnection }} max_retries = -1 db_max_retries = -1 -# Wait for writes to complete when doing a read, update, or insert -# Relevant for multi-master deployments so that workers table works as intended -# https://mariadb.com/docs/server/ref/mdb/system-variables/wsrep_sync_wait/ -mysql_wsrep_sync_wait = 7 - [os_brick] lock_path = /var/locks/openstack/os-brick