MDEV-21335 : Galera test failure on suite wsrep

Problem was that wsrep_on was OFF.

This is 10.4 version.

mysql-test/suite/galera/t/galera_partition.test

 --source include/galera_cluster.inc
 --source include/have_partition.inc
+--source include/big_test.inc
 
 --connection node_1
 
@@ -407,16 +408,16 @@ insert into t1 (id, dt) values (350, '2010-12-17 00:00:00');
 SELECT COUNT(*) FROM t1;
 
 --connection node_2
---send call p1(100);
+--send call p1(10);
 
 --connection node_1a
---send call p1(100);
+--send call p1(10);
 
 --connection node_3
---send call p1(100);
+--send call p1(10);
 
 --connection node_4
---send call p1(100);
+--send call p1(10);
 
 --connection node_1
 SET SESSION wsrep_OSU_method='RSU';

mysql-test/suite/wsrep/disabled.def

@@ -10,7 +10,6 @@
 #
 ##############################################################################
 
-foreign_key : MENT-535 Galera test failures on wsrep suite
-wsrep.pool_of_threads : Sporadic failure "WSREP has not yet prepared node for application use"
 variables : MDEV-20581 Crash on wsrep.variables test case
-pool_of_threads : MENT-535 Galera test failures on wsrep suite
+
+

mysql-test/suite/wsrep/my.cnf

@@ -2,7 +2,7 @@
 !include include/default_mysqld.cnf
 
 [mysqld.1]
-wsrep-on=OFF
+wsrep-on=ON
 #galera_port=@OPT.port
 #ist_port=@OPT.port
 #sst_port=@OPT.port

mysql-test/suite/wsrep/r/variables.result

@@ -21,119 +21,123 @@ SET GLOBAL wsrep_provider=none;
 CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*");
 SHOW GLOBAL STATUS LIKE 'wsrep%';
 Variable_name	Value
-wsrep_applier_thread_count	#
+wsrep_local_state_uuid	#
+wsrep_protocol_version	#
+wsrep_last_committed	#
+wsrep_replicated	#
+wsrep_replicated_bytes	#
+wsrep_repl_keys	#
+wsrep_repl_keys_bytes	#
+wsrep_repl_data_bytes	#
+wsrep_repl_other_bytes	#
+wsrep_received	#
+wsrep_received_bytes	#
+wsrep_local_commits	#
+wsrep_local_cert_failures	#
+wsrep_local_replays	#
+wsrep_local_send_queue	#
+wsrep_local_send_queue_max	#
+wsrep_local_send_queue_min	#
+wsrep_local_send_queue_avg	#
+wsrep_local_recv_queue	#
+wsrep_local_recv_queue_max	#
+wsrep_local_recv_queue_min	#
+wsrep_local_recv_queue_avg	#
+wsrep_local_cached_downto	#
+wsrep_flow_control_paused_ns	#
+wsrep_flow_control_paused	#
+wsrep_flow_control_sent	#
+wsrep_flow_control_recv	#
+wsrep_cert_deps_distance	#
 wsrep_apply_oooe	#
 wsrep_apply_oool	#
 wsrep_apply_window	#
-wsrep_causal_reads	#
-wsrep_cert_deps_distance	#
+wsrep_commit_oooe	#
+wsrep_commit_oool	#
+wsrep_commit_window	#
+wsrep_local_state	#
+wsrep_local_state_comment	#
 wsrep_cert_index_size	#
+wsrep_causal_reads	#
 wsrep_cert_interval	#
+wsrep_open_transactions	#
+wsrep_open_connections	#
+wsrep_incoming_addresses	#
+wsrep_applier_thread_count	#
+wsrep_cluster_capabilities	#
 wsrep_cluster_conf_id	#
 wsrep_cluster_size	#
 wsrep_cluster_state_uuid	#
 wsrep_cluster_status	#
-wsrep_commit_oooe	#
-wsrep_commit_oool	#
-wsrep_commit_window	#
 wsrep_connected	#
-wsrep_flow_control_paused	#
-wsrep_flow_control_paused_ns	#
-wsrep_flow_control_recv	#
-wsrep_flow_control_sent	#
-wsrep_incoming_addresses	#
-wsrep_last_committed	#
 wsrep_local_bf_aborts	#
-wsrep_local_cached_downto	#
-wsrep_local_cert_failures	#
-wsrep_local_commits	#
 wsrep_local_index	#
-wsrep_local_recv_queue	#
-wsrep_local_recv_queue_avg	#
-wsrep_local_recv_queue_max	#
-wsrep_local_recv_queue_min	#
-wsrep_local_replays	#
-wsrep_local_send_queue	#
-wsrep_local_send_queue_avg	#
-wsrep_local_send_queue_max	#
-wsrep_local_send_queue_min	#
-wsrep_local_state	#
-wsrep_local_state_comment	#
-wsrep_local_state_uuid	#
-wsrep_open_connections	#
-wsrep_open_transactions	#
-wsrep_protocol_version	#
+wsrep_provider_capabilities	#
 wsrep_provider_name	#
 wsrep_provider_vendor	#
 wsrep_provider_version	#
 wsrep_ready	#
-wsrep_received	#
-wsrep_received_bytes	#
-wsrep_repl_data_bytes	#
-wsrep_repl_keys	#
-wsrep_repl_keys_bytes	#
-wsrep_repl_other_bytes	#
-wsrep_replicated	#
-wsrep_replicated_bytes	#
 wsrep_rollbacker_thread_count	#
 wsrep_thread_count	#
 
 SHOW GLOBAL STATUS LIKE 'wsrep_%';
 Variable_name	Value
-wsrep_applier_thread_count	#
+wsrep_local_state_uuid	#
+wsrep_protocol_version	#
+wsrep_last_committed	#
+wsrep_replicated	#
+wsrep_replicated_bytes	#
+wsrep_repl_keys	#
+wsrep_repl_keys_bytes	#
+wsrep_repl_data_bytes	#
+wsrep_repl_other_bytes	#
+wsrep_received	#
+wsrep_received_bytes	#
+wsrep_local_commits	#
+wsrep_local_cert_failures	#
+wsrep_local_replays	#
+wsrep_local_send_queue	#
+wsrep_local_send_queue_max	#
+wsrep_local_send_queue_min	#
+wsrep_local_send_queue_avg	#
+wsrep_local_recv_queue	#
+wsrep_local_recv_queue_max	#
+wsrep_local_recv_queue_min	#
+wsrep_local_recv_queue_avg	#
+wsrep_local_cached_downto	#
+wsrep_flow_control_paused_ns	#
+wsrep_flow_control_paused	#
+wsrep_flow_control_sent	#
+wsrep_flow_control_recv	#
+wsrep_cert_deps_distance	#
 wsrep_apply_oooe	#
 wsrep_apply_oool	#
 wsrep_apply_window	#
-wsrep_causal_reads	#
-wsrep_cert_deps_distance	#
+wsrep_commit_oooe	#
+wsrep_commit_oool	#
+wsrep_commit_window	#
+wsrep_local_state	#
+wsrep_local_state_comment	#
 wsrep_cert_index_size	#
+wsrep_causal_reads	#
 wsrep_cert_interval	#
+wsrep_open_transactions	#
+wsrep_open_connections	#
+wsrep_incoming_addresses	#
+wsrep_applier_thread_count	#
+wsrep_cluster_capabilities	#
 wsrep_cluster_conf_id	#
 wsrep_cluster_size	#
 wsrep_cluster_state_uuid	#
 wsrep_cluster_status	#
-wsrep_commit_oooe	#
-wsrep_commit_oool	#
-wsrep_commit_window	#
 wsrep_connected	#
-wsrep_flow_control_paused	#
-wsrep_flow_control_paused_ns	#
-wsrep_flow_control_recv	#
-wsrep_flow_control_sent	#
-wsrep_incoming_addresses	#
-wsrep_last_committed	#
 wsrep_local_bf_aborts	#
-wsrep_local_cached_downto	#
-wsrep_local_cert_failures	#
-wsrep_local_commits	#
 wsrep_local_index	#
-wsrep_local_recv_queue	#
-wsrep_local_recv_queue_avg	#
-wsrep_local_recv_queue_max	#
-wsrep_local_recv_queue_min	#
-wsrep_local_replays	#
-wsrep_local_send_queue	#
-wsrep_local_send_queue_avg	#
-wsrep_local_send_queue_max	#
-wsrep_local_send_queue_min	#
-wsrep_local_state	#
-wsrep_local_state_comment	#
-wsrep_local_state_uuid	#
-wsrep_open_connections	#
-wsrep_open_transactions	#
-wsrep_protocol_version	#
+wsrep_provider_capabilities	#
 wsrep_provider_name	#
 wsrep_provider_vendor	#
 wsrep_provider_version	#
 wsrep_ready	#
-wsrep_received	#
-wsrep_received_bytes	#
-wsrep_repl_data_bytes	#
-wsrep_repl_keys	#
-wsrep_repl_keys_bytes	#
-wsrep_repl_other_bytes	#
-wsrep_replicated	#
-wsrep_replicated_bytes	#
 wsrep_rollbacker_thread_count	#
 wsrep_thread_count	#
 SHOW GLOBAL STATUS LIKE 'wsrep_local_state_comment';
@@ -159,7 +163,7 @@ SET GLOBAL wsrep_provider=none;
 call mtr.add_suppression("WSREP: Failed to get provider options");
 SELECT @@global.wsrep_provider;
 @@global.wsrep_provider
-libgalera_smm.so
+/usr/lib/libgalera_4_smm.so
 SELECT @@global.wsrep_slave_threads;
 @@global.wsrep_slave_threads
 1
@@ -175,7 +179,7 @@ wsrep_thread_count	0
 
 SELECT @@global.wsrep_provider;
 @@global.wsrep_provider
-libgalera_smm.so
+/usr/lib/libgalera_4_smm.so
 SELECT @@global.wsrep_cluster_address;
 @@global.wsrep_cluster_address
 
@@ -202,7 +206,7 @@ EXPECT_2
 2
 SELECT @@global.wsrep_provider;
 @@global.wsrep_provider
-libgalera_smm.so
+/usr/lib/libgalera_4_smm.so
 SELECT @@global.wsrep_cluster_address;
 @@global.wsrep_cluster_address
 gcomm://
@@ -256,7 +260,6 @@ SELECT @@global.wsrep_sst_auth;
 NULL
 SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved;
 SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved;
-SET GLOBAL wsrep_provider= none;
 SET GLOBAL wsrep_cluster_address= @wsrep_cluster_address_saved;
 SET GLOBAL wsrep_provider_options= @wsrep_provider_options_saved;
 # End of test.

mysql-test/suite/wsrep/t/alter_table_innodb.cnf

+!include include/default_mysqld.cnf
+
+[mysqld]
+wsrep-on=0
+
+[mysqld.1]
+wsrep-on=0
+#galera_port=@OPT.port
+#ist_port=@OPT.port
+#sst_port=@OPT.port
+wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=10M'
+wsrep_cluster_address='not empty but invalid'

mysql-test/suite/wsrep/t/alter_table_innodb.opt

---wsrep-on=0

mysql-test/suite/wsrep/t/mdev_10186.cnf

-!include ../my.cnf
+!include include/default_mysqld.cnf
+
+[mysqld]
+wsrep-on=0
 
 [mysqld.1]
-wsrep-on=OFF
-wsrep-provider=@ENV.WSREP_PROVIDER
+wsrep-on=0
+#galera_port=@OPT.port
+#ist_port=@OPT.port
+#sst_port=@OPT.port
+wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=10M'
+wsrep_cluster_address='not empty but invalid'
+innodb_autoinc_lock_mode=2
+wsrep-provider=$WSREP_PROVIDER
 wsrep-cluster-address=gcomm://

mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink.opt

+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_on=1 --binlog_format=ROW

mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink.test

 --source include/have_wsrep.inc
 --source include/have_symlink.inc
 --source include/not_windows.inc
+--source include/have_innodb.inc
 
 --echo #
 --echo # MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above

mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink_skip.opt

+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_on=1 --binlog_format=ROW

mysql-test/suite/wsrep/t/mysql_tzinfo_to_sql_symlink_skip.test

 --source include/have_wsrep.inc
 --source include/have_symlink.inc
 --source include/not_windows.inc
+--source include/have_innodb.inc
 
 --echo #
 --echo # MDEV-5226 mysql_tzinfo_to_sql errors with tzdata 2013f and above

mysql-test/suite/wsrep/t/plugin.opt

+--binlog_format=ROW --log-bin --wsrep-on=1 --innodb_autoinc_lock_mode=2 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm://

mysql-test/suite/wsrep/t/plugin.test

 --source include/have_wsrep.inc
+--source include/have_innodb.inc
 
 #
 # MDEV-7604: wsrep plugin lists its status as Unknown

mysql-test/suite/wsrep/t/pool_of_threads.cnf

-!include ../my.cnf
-
-[mysqld.1]
-wsrep-on=ON
-wsrep-provider=@ENV.WSREP_PROVIDER
-wsrep-cluster-address=gcomm://
-thread_handling=pool-of-threads
-

mysql-test/suite/wsrep/t/pool_of_threads.opt

---innodb_autoinc_lock_mode=2 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --thread_handling=pool-of-threads wsrep-on=1
+--innodb_autoinc_lock_mode=2 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --thread_handling=pool-of-threads --wsrep-on=1

mysql-test/suite/wsrep/t/trans.opt

+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_on=1 --binlog_format=ROW

mysql-test/suite/wsrep/t/variables.opt

+--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep_on=1 --binlog_format=ROW

mysql-test/suite/wsrep/t/variables.test

 --source include/have_wsrep.inc
 --source include/force_restart.inc
+--source include/have_innodb.inc
 
 SET @wsrep_provider_options_saved= @@global.wsrep_provider_options;
 SET @wsrep_cluster_address_saved= @@global.wsrep_cluster_address;
@@ -30,8 +31,6 @@ CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*")
 
 --disable_query_log
 eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
---let $galera_version=25.3.24
-source include/check_galera_version.inc;
 --enable_query_log
 
 --replace_column 2 #
@@ -158,9 +157,11 @@ SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved;
 
 # Reset (for mtr internal checks)
 SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved;
-SET GLOBAL wsrep_provider= none;
 SET GLOBAL wsrep_cluster_address= @wsrep_cluster_address_saved;
 SET GLOBAL wsrep_provider_options= @wsrep_provider_options_saved;
+--disable_query_log
+eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
+--enable_query_log
 
 --echo # End of test.
 

sql/wsrep_mysqld.cc

@@ -2288,6 +2288,7 @@ int wsrep_wait_committing_connections_close(int wait_time)
 {
   int sleep_time= 100;
 
+  WSREP_DEBUG("wait for committing transaction to close: %d sleep: %d", wait_time, sleep_time);
   while (server_threads.iterate(have_committing_connections) && wait_time > 0)
   {
     WSREP_DEBUG("wait for committing transaction to close: %d", wait_time);