MDEV-21489 : wsrep_cluster_conf_id has wrong value

Variable was not updated after initialization.
MariaDB · May 4, 2020 · d002ec2 · d002ec2
1 parent 7f03a93
commit d002ec2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/mysql-test/suite/galera/r/galera_var_cluster_conf_id.result b/mysql-test/suite/galera/r/galera_var_cluster_conf_id.result
@@ -0,0 +1,10 @@
+connection node_2;
+connection node_1;
+connection node_1;
+show status like 'wsrep_cluster_conf_id';
+Variable_name	Value
+wsrep_cluster_conf_id	2
+connection node_2;
+show status like 'wsrep_cluster_conf_id';
+Variable_name	Value
+wsrep_cluster_conf_id	2
diff --git a/mysql-test/suite/galera/t/galera_var_cluster_conf_id.test b/mysql-test/suite/galera/t/galera_var_cluster_conf_id.test
@@ -0,0 +1,7 @@
+--source include/galera_cluster.inc
+
+--connection node_1
+show status like 'wsrep_cluster_conf_id';
+
+--connection node_2
+show status like 'wsrep_cluster_conf_id';
diff --git a/sql/wsrep_server_service.cc b/sql/wsrep_server_service.cc
@@ -201,6 +201,7 @@ void Wsrep_server_service::log_view(
   wsrep_update_cluster_state_uuid(os.str().c_str());
   mysql_mutex_unlock(&LOCK_status);
   wsrep_config_state->set(view);
+  wsrep_cluster_conf_id= view.view_seqno().get();
 
   if (view.status() == wsrep::view::primary)
   {