Skip to content

Commit 4675feb

Browse files
sysprgsysprg
committed
Added missing connection lines to some tests
1 parent 677f1ef commit 4675feb

File tree

3 files changed

+120
-0
lines changed

3 files changed

+120
-0
lines changed

‎mysql-test/suite/galera_3nodes/r/galera_join_with_cc_A.result‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,79 @@
1+
connection node_1;
12
CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
23
INSERT INTO t1 VALUES (1, 1);
4+
connection node_2;
5+
connection node_1;
36
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
7+
connection node_2;
8+
connection node_3;
49
INSERT INTO t1 VALUES (2, 3);
10+
connection node_2;
11+
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
512
SET wsrep_sync_wait = 0;
613
SET wsrep_on = OFF;
714
SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
15+
connection node_1;
816
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
17+
connection node_2;
918
INSERT INTO t1 VALUES (3, 2);
19+
connection node_1a;
1020
SET SESSION wsrep_on = 0;
1121
SET SESSION wsrep_on = 0;
22+
connection node_3;
23+
connection node_1;
1224
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
25+
connection node_2;
26+
connection node_3;
1327
INSERT INTO t1 VALUES (4, 3);
28+
connection node_2;
29+
connection node_1;
1430
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
31+
connection node_2;
1532
INSERT INTO t1 VALUES (5, 2);
33+
connection node_3;
34+
connection node_1a;
1635
SET GLOBAL wsrep_provider_options = 'dbug=d,before_send_state_request';
1736
SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
1837
SET SESSION wsrep_on = 0;
1938
SET SESSION wsrep_on = 0;
39+
connection node_1;
2040
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
41+
connection node_2;
42+
connection node_3;
2143
INSERT INTO t1 VALUES (6, 3);
44+
connection node_2;
45+
connection node_1;
2246
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
47+
connection node_2;
2348
INSERT INTO t1 VALUES (7, 2);
49+
connection node_3;
50+
connection node_1;
2451
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
52+
connection node_2;
53+
connection node_3;
2554
INSERT INTO t1 VALUES (8, 3);
55+
connection node_2;
56+
connection node_1;
2657
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
58+
connection node_2;
59+
connection node_1a;
2760
SET GLOBAL wsrep_provider_options = 'dbug=d,process_primary_configuration';
2861
SET GLOBAL wsrep_provider_options = 'signal=before_send_state_request';
2962
SET SESSION wsrep_on = 0;
3063
SET SESSION wsrep_on = 0;
64+
connection node_2;
3165
INSERT INTO t1 VALUES (9, 2);
66+
connection node_3;
67+
connection node_1a;
3268
SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
3369
SET SESSION wsrep_on = 0;
3470
SET SESSION wsrep_on = 0;
3571
SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
3672
SET GLOBAL wsrep_provider_options = 'dbug=';
73+
connection node_1;
3774
DROP TABLE t1;
3875
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
76+
connection node_2;
3977
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
78+
connection node_3;
4079
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");

‎mysql-test/suite/galera_3nodes/r/galera_join_with_cc_B.result‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,37 @@
1+
connection node_1;
12
CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
23
INSERT INTO t1 VALUES (1, 1);
4+
connection node_2;
5+
connection node_1;
36
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
7+
connection node_2;
8+
connection node_3;
49
INSERT INTO t1 VALUES (2, 3);
10+
connection node_2;
11+
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
512
SET wsrep_sync_wait = 0;
613
SET wsrep_on = OFF;
714
SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
15+
connection node_1;
816
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
17+
connection node_2;
918
INSERT INTO t1 VALUES (3, 2);
19+
connection node_1a;
1020
SET SESSION wsrep_on = 0;
1121
SET SESSION wsrep_on = 0;
22+
connection node_3;
23+
connection node_1;
1224
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
25+
connection node_2;
26+
connection node_3;
1327
INSERT INTO t1 VALUES (4, 3);
28+
connection node_2;
29+
connection node_1;
1430
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
31+
connection node_2;
1532
INSERT INTO t1 VALUES (5, 2);
33+
connection node_3;
34+
connection node_1a;
1635
SET GLOBAL wsrep_provider_options = 'dbug=d,before_send_state_request';
1736
SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
1837
SET SESSION wsrep_on = 0;
@@ -24,18 +43,35 @@ SET SESSION wsrep_on = 0;
2443
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters';
2544
VARIABLE_NAME VARIABLE_VALUE
2645
WSREP_DEBUG_SYNC_WAITERS after_shift_to_joining
46+
connection node_1;
2747
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
48+
connection node_2;
49+
connection node_3;
2850
INSERT INTO t1 VALUES (6, 3);
51+
connection node_2;
52+
connection node_1;
2953
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
54+
connection node_2;
3055
INSERT INTO t1 VALUES (7, 2);
56+
connection node_3;
57+
connection node_1;
3158
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
59+
connection node_2;
60+
connection node_3;
3261
INSERT INTO t1 VALUES (8, 3);
62+
connection node_2;
63+
connection node_1;
3364
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
65+
connection node_2;
66+
connection node_1a;
3467
SET GLOBAL wsrep_provider_options = 'dbug=d,process_primary_configuration';
3568
SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
3669
SET SESSION wsrep_on = 0;
3770
SET SESSION wsrep_on = 0;
71+
connection node_2;
3872
INSERT INTO t1 VALUES (9, 2);
73+
connection node_3;
74+
connection node_1a;
3975
SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
4076
SET SESSION wsrep_on = 0;
4177
SET SESSION wsrep_on = 0;
@@ -44,7 +80,10 @@ VARIABLE_NAME VARIABLE_VALUE
4480
WSREP_DEBUG_SYNC_WAITERS process_primary_configuration
4581
SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
4682
SET GLOBAL wsrep_provider_options = 'dbug=';
83+
connection node_1;
4784
DROP TABLE t1;
4885
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
86+
connection node_2;
4987
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
88+
connection node_3;
5089
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");

‎mysql-test/suite/galera_3nodes/r/galera_join_with_cc_C.result‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,83 @@
1+
connection node_1;
12
CREATE TABLE t1 (pk INT PRIMARY KEY, node INT) ENGINE=innodb;
23
INSERT INTO t1 VALUES (1, 1);
4+
connection node_2;
5+
connection node_1;
36
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
7+
connection node_2;
8+
connection node_3;
49
INSERT INTO t1 VALUES (2, 3);
10+
connection node_2;
11+
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
512
SET wsrep_sync_wait = 0;
613
SET wsrep_on = OFF;
714
SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
15+
connection node_1;
816
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
17+
connection node_2;
918
INSERT INTO t1 VALUES (3, 2);
19+
connection node_1a;
1020
SET SESSION wsrep_on = 0;
1121
SET SESSION wsrep_on = 0;
22+
connection node_3;
23+
connection node_1;
1224
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
25+
connection node_2;
26+
connection node_3;
1327
INSERT INTO t1 VALUES (4, 3);
28+
connection node_2;
29+
connection node_1;
1430
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
31+
connection node_2;
1532
INSERT INTO t1 VALUES (5, 2);
33+
connection node_3;
34+
connection node_1a;
1635
SET GLOBAL wsrep_provider_options = 'dbug=d,before_send_state_request';
1736
SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
1837
SET SESSION wsrep_on = 0;
1938
SET SESSION wsrep_on = 0;
2039
SET GLOBAL wsrep_provider_options = 'dbug=';
40+
connection node_1;
2141
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
42+
connection node_2;
43+
connection node_3;
44+
connection node_1a;
2245
SET GLOBAL wsrep_provider_options = 'dbug=d,after_shift_to_joining';
2346
SET GLOBAL wsrep_provider_options = 'signal=before_send_state_request';
2447
4
2548
SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_debug_sync_waiters';
2649
VARIABLE_NAME VARIABLE_VALUE
2750
WSREP_DEBUG_SYNC_WAITERS
51+
connection node_3;
2852
INSERT INTO t1 VALUES (6, 3);
53+
connection node_2;
54+
connection node_1;
2955
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
56+
connection node_2;
3057
INSERT INTO t1 VALUES (7, 2);
58+
connection node_3;
59+
connection node_1a;
3160
SET SESSION wsrep_on = 0;
3261
SET SESSION wsrep_on = 0;
3362
SET GLOBAL wsrep_provider_options = 'dbug=';
3463
SET GLOBAL wsrep_provider_options = 'dbug=d,process_primary_configuration';
3564
SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
65+
connection node_1;
3666
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
67+
connection node_2;
68+
connection node_3;
3769
INSERT INTO t1 VALUES (8, 3);
70+
connection node_2;
71+
connection node_1;
3872
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
73+
connection node_2;
74+
connection node_1a;
3975
SET SESSION wsrep_on = 0;
4076
SET SESSION wsrep_on = 0;
77+
connection node_2;
4178
INSERT INTO t1 VALUES (9, 2);
79+
connection node_3;
80+
connection node_1a;
4281
SET GLOBAL wsrep_provider_options = 'signal=process_primary_configuration';
4382
SET SESSION wsrep_on = 0;
4483
SET SESSION wsrep_on = 0;
@@ -48,8 +87,11 @@ SET SESSION wsrep_on = 0;
4887
SET SESSION wsrep_on = 0;
4988
SET GLOBAL wsrep_provider_options = 'dbug=';
5089
SET GLOBAL wsrep_provider_options = 'signal=after_shift_to_joining';
90+
connection node_1;
5191
DROP TABLE t1;
5292
call mtr.add_suppression("WSREP: Send action {\(.*\), STATE_REQUEST} returned -107 \\(Transport endpoint is not connected\\)");
5393
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
94+
connection node_2;
5495
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");
96+
connection node_3;
5597
call mtr.add_suppression("WSREP: Rejecting JOIN message from \(.*\): new State Transfer required.");

0 commit comments

Comments
 (0)