MDEV-25614 : Galera test failure on GCF-354

Modified node config with longer timeouts for suspect,
inactive, install and wait_prim timeout. Increased
node_1 weight to keep it primary component when
other nodes are voted out.
Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>

mysql-test/suite/galera_3nodes/disabled.def

@@ -13,4 +13,3 @@
 galera_2_cluster : MDEV-32631 galera_2_cluster: before_rollback(): Assertion `0' failed
 galera_pc_bootstrap : temporarily disabled at the request of Codership
 galera_ipv6_mariabackup_section : temporarily disabled at the request of Codership
-GCF-354 : MDEV-25614 Galera test failure on GCF-354

mysql-test/suite/galera_3nodes/r/GCF-354.result

 connection node_2;
 connection node_1;
+connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3;
 connection node_1;
 connection node_2;
 connection node_3;
 connection node_2;
-SET SESSION wsrep_on=OFF;
+SET wsrep_on=OFF;
 DROP SCHEMA test;
 connection node_3;
-SET SESSION wsrep_on=OFF;
+SET wsrep_on=OFF;
 CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
 connection node_1;
 CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
-INSERT INTO test.t1 values (1);
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+VARIABLE_VALUE
+1
 SHOW STATUS LIKE 'wsrep_cluster_status';
 Variable_name	Value
 wsrep_cluster_status	Primary

mysql-test/suite/galera_3nodes/t/GCF-354.cnf

@@ -3,3 +3,14 @@
 [mysqld]
 wsrep-ignore-apply-errors=0
 wsrep_sync_wait=0
+loose-gcf-354=0
+wsrep-debug=1
+
+[mysqld.1]
+wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=1G;pc.weight=4'
+
+[mysqld.2]
+wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=1G'
+
+[mysqld.3]
+wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.3.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=1G'

mysql-test/suite/galera_3nodes/t/GCF-354.test

@@ -2,9 +2,7 @@
 --source include/have_innodb.inc
 --source include/force_restart.inc
 
---let $galera_connection_name = node_3
---let $galera_server_number = 3
---source include/galera_connect.inc
+--connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
 
 # Save original auto_increment_offset values.
 --let $node_1=node_1
@@ -16,11 +14,11 @@
 # 1. Create different inconsistencies on nodes 2 and 3
 #
 --connection node_2
-SET SESSION wsrep_on=OFF;
+SET wsrep_on=OFF;
 DROP SCHEMA test;
 
 --connection node_3
-SET SESSION wsrep_on=OFF;
+SET wsrep_on=OFF;
 CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
 #
 # 2. The following should generate different errors on nodes 2 and 3 and 
@@ -29,10 +27,10 @@ CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
 #
 --connection node_1
 CREATE TABLE test.t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
-INSERT INTO test.t1 values (1);
 
 --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
 --source include/wait_condition.inc
+SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status'
 --source include/wait_condition.inc
 SHOW STATUS LIKE 'wsrep_cluster_status';