Skip to content

Commit cd1c108

Browse files
author
Jan Lindström
committed
Fix test cases that use debug galera library.
Changes to be committed: modified: mysql-test/suite/galera/r/MW-369.result modified: mysql-test/suite/galera/r/MW-402.result modified: mysql-test/suite/galera/r/galera#500.result modified: mysql-test/suite/galera/r/galera_gcs_fragment.result modified: mysql-test/suite/galera/r/mysql-wsrep#332.result
1 parent 36a9694 commit cd1c108

File tree

5 files changed

+97
-11
lines changed

5 files changed

+97
-11
lines changed

‎mysql-test/suite/galera/r/MW-369.result

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,32 @@ CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER,
33
CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ;
44
INSERT INTO p VALUES (1, 0);
55
INSERT INTO p VALUES (2, 0);
6+
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
7+
connection node_1;
68
SET AUTOCOMMIT=ON;
79
START TRANSACTION;
810
DELETE FROM p WHERE f1 = 1;
11+
connection node_1a;
912
SET SESSION wsrep_sync_wait = 0;
1013
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
14+
connection node_2;
1115
INSERT INTO c VALUES (1, 1);
16+
connection node_1a;
1217
SET SESSION wsrep_on = 0;
1318
SET SESSION wsrep_on = 1;
1419
SET GLOBAL wsrep_provider_options = 'dbug=';
1520
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
21+
connection node_1;
1622
COMMIT;
23+
connection node_1a;
1724
SET SESSION wsrep_on = 0;
1825
SET SESSION wsrep_on = 1;
1926
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
2027
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
2128
SET GLOBAL wsrep_provider_options = 'dbug=';
22-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
29+
connection node_1;
30+
ERROR 40001: Deadlock: wsrep aborted transaction
31+
connection node_2;
2332
SELECT * FROM p;
2433
f1 f2
2534
1 0
@@ -29,29 +38,38 @@ f1 p_id
2938
1 1
3039
DROP TABLE c;
3140
DROP TABLE p;
41+
connection node_1;
3242
CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
3343
CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER,
3444
f2 INTEGER,
3545
CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ;
3646
INSERT INTO p VALUES (1, 0);
3747
INSERT INTO p VALUES (2, 0);
3848
INSERT INTO c VALUES (1, 1, 0);
49+
connection node_1;
3950
SET AUTOCOMMIT=ON;
4051
START TRANSACTION;
4152
UPDATE p SET f2 = 1 WHERE f1 = 1;
53+
connection node_1a;
4254
SET SESSION wsrep_sync_wait = 0;
4355
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
56+
connection node_2;
4457
UPDATE c SET f2 = 1 WHERE f1 = 1;
58+
connection node_1a;
4559
SET SESSION wsrep_on = 0;
4660
SET SESSION wsrep_on = 1;
4761
SET GLOBAL wsrep_provider_options = 'dbug=';
4862
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
63+
connection node_1;
4964
COMMIT;
65+
connection node_1a;
5066
SET SESSION wsrep_on = 0;
5167
SET SESSION wsrep_on = 1;
5268
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
5369
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
5470
SET GLOBAL wsrep_provider_options = 'dbug=';
71+
connection node_1;
72+
connection node_2;
5573
SELECT * FROM p;
5674
f1 f2
5775
1 1
@@ -61,28 +79,37 @@ f1 p_id f2
6179
1 1 1
6280
DROP TABLE c;
6381
DROP TABLE p;
82+
connection node_1;
6483
CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
6584
CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER,
6685
CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f1)) ;
6786
INSERT INTO p VALUES (1, 0);
6887
INSERT INTO p VALUES (2, 0);
6988
INSERT INTO c VALUES (1, 1);
89+
connection node_1;
7090
SET AUTOCOMMIT=ON;
7191
START TRANSACTION;
7292
UPDATE p SET f2 = 1 WHERE f1 = 1;
93+
connection node_1a;
7394
SET SESSION wsrep_sync_wait = 0;
7495
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
96+
connection node_2;
7597
DELETE FROM c WHERE f1 = 1;
98+
connection node_1a;
7699
SET SESSION wsrep_on = 0;
77100
SET SESSION wsrep_on = 1;
78101
SET GLOBAL wsrep_provider_options = 'dbug=';
79102
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
103+
connection node_1;
80104
COMMIT;
105+
connection node_1a;
81106
SET SESSION wsrep_on = 0;
82107
SET SESSION wsrep_on = 1;
83108
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
84109
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
85110
SET GLOBAL wsrep_provider_options = 'dbug=';
111+
connection node_1;
112+
connection node_2;
86113
SELECT * FROM p;
87114
f1 f2
88115
1 1
@@ -95,23 +122,31 @@ CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER UNIQUE KEY) ENGINE=INNODB;
95122
CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER,
96123
CONSTRAINT fk_1 FOREIGN KEY (p_id) REFERENCES p (f2)) ;
97124
INSERT INTO p VALUES (1, 0);
125+
connection node_1;
98126
SET AUTOCOMMIT=ON;
99127
START TRANSACTION;
100128
UPDATE p SET f2 = 1 WHERE f1 = 1;
129+
connection node_1a;
101130
SET SESSION wsrep_sync_wait = 0;
102131
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
132+
connection node_2;
103133
INSERT INTO c VALUES (1, 0);;
134+
connection node_1a;
104135
SET SESSION wsrep_on = 0;
105136
SET SESSION wsrep_on = 1;
106137
SET GLOBAL wsrep_provider_options = 'dbug=';
107138
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
139+
connection node_1;
108140
COMMIT;
141+
connection node_1a;
109142
SET SESSION wsrep_on = 0;
110143
SET SESSION wsrep_on = 1;
111144
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
112145
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
113146
SET GLOBAL wsrep_provider_options = 'dbug=';
114-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
147+
connection node_1;
148+
ERROR 40001: Deadlock: wsrep aborted transaction
149+
connection node_2;
115150
SELECT * FROM p;
116151
f1 f2
117152
1 0
@@ -127,23 +162,31 @@ ON DELETE CASCADE) ;
127162
INSERT INTO p VALUES (1, 0);
128163
INSERT INTO p VALUES (2, 0);
129164
INSERT INTO c VALUES (1, 1, 0);
165+
connection node_1;
130166
SET AUTOCOMMIT=ON;
131167
START TRANSACTION;
132168
DELETE FROM p WHERE f1 = 1;
169+
connection node_1a;
133170
SET SESSION wsrep_sync_wait = 0;
134171
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
172+
connection node_2;
135173
UPDATE c SET f2 = 1 WHERE f1 = 1;
174+
connection node_1a;
136175
SET SESSION wsrep_on = 0;
137176
SET SESSION wsrep_on = 1;
138177
SET GLOBAL wsrep_provider_options = 'dbug=';
139178
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
179+
connection node_1;
140180
COMMIT;
181+
connection node_1a;
141182
SET SESSION wsrep_on = 0;
142183
SET SESSION wsrep_on = 1;
143184
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
144185
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
145186
SET GLOBAL wsrep_provider_options = 'dbug=';
146-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
187+
connection node_1;
188+
ERROR 40001: Deadlock: wsrep aborted transaction
189+
connection node_2;
147190
SELECT * FROM p;
148191
f1 f2
149192
1 0

‎mysql-test/suite/galera/r/MW-402.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
3030
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
3131
SET GLOBAL wsrep_provider_options = 'dbug=';
3232
connection node_1;
33-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
33+
ERROR 40001: Deadlock: wsrep aborted transaction
3434
connection node_2;
3535
SELECT * FROM p;
3636
f1 f2
@@ -70,7 +70,7 @@ SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
7070
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
7171
SET GLOBAL wsrep_provider_options = 'dbug=';
7272
connection node_1;
73-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
73+
ERROR 40001: Deadlock: wsrep aborted transaction
7474
connection node_2;
7575
SELECT * FROM p;
7676
f1 f2
@@ -112,7 +112,7 @@ SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
112112
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
113113
SET GLOBAL wsrep_provider_options = 'dbug=';
114114
connection node_1;
115-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
115+
ERROR 40001: Deadlock: wsrep aborted transaction
116116
connection node_2;
117117
SELECT * FROM p;
118118
f1 f2
@@ -145,7 +145,7 @@ SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
145145
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
146146
SET GLOBAL wsrep_provider_options = 'dbug=';
147147
connection node_1;
148-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
148+
ERROR 40001: Deadlock: wsrep aborted transaction
149149
connection node_2;
150150
SELECT * FROM p;
151151
f1 f2

‎mysql-test/suite/galera/r/galera#500.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
connection node_2;
12
SET SESSION wsrep_sync_wait = 0;
23
SET GLOBAL wsrep_provider_options="gmcast.isolate=2";
4+
connection node_1;
35
SET SESSION wsrep_sync_wait = 0;
46
SHOW STATUS LIKE 'wsrep_cluster_status';
57
Variable_name Value
68
wsrep_cluster_status non-Primary
79
SET SESSION wsrep_sync_wait = default;
810
SET GLOBAL wsrep_provider_options="pc.bootstrap=1";
11+
connection node_2;
912
SET SESSION wsrep_on=0;
13+
connection node_2;
1014
CALL mtr.add_suppression("WSREP: exception from gcomm, backend must be restarted: Gcomm backend termination was requested by setting gmcast.isolate=2.");

‎mysql-test/suite/galera/r/galera_gcs_fragment.result

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,35 @@
1+
connection node_1;
2+
connection node_2;
13
CREATE TABLE t1 (f1 INT PRIMARY KEY, f2 TEXT);
4+
connection node_2;
25
SET GLOBAL wsrep_cluster_address='';
6+
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
37
SET SESSION wsrep_sync_wait=0;
48
SET GLOBAL wsrep_provider_options = 'dbug=d,gcs_core_after_frag_send';
9+
connection node_1;
510
SET SESSION wsrep_retry_autocommit=0;
611
INSERT INTO t1 VALUES (1, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
12+
connection node_1a;
713
SET SESSION wsrep_on = 0;
814
SET SESSION wsrep_on = 1;
915
SET GLOBAL wsrep_provider_options = 'dbug=';
16+
connection node_2;
1017
SET SESSION wsrep_on = 0;
1118
SET SESSION wsrep_on = 1;
1219
INSERT INTO t1 VALUES (2, "bbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
20+
connection node_1a;
1321
SET GLOBAL wsrep_provider_options = 'signal=gcs_core_after_frag_send';
14-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
22+
connection node_1;
23+
ERROR 40001: Deadlock: wsrep aborted transaction
1524
INSERT INTO t1 VALUES (3, "cccccaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
1625
SELECT * FROM t1;
1726
f1 f2
1827
2 bbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
1928
3 cccccaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
29+
connection node_2;
2030
SELECT * FROM t1;
2131
f1 f2
2232
2 bbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2333
3 cccccaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
34+
connection node_1;
2435
DROP TABLE t1;

‎mysql-test/suite/galera/r/mysql-wsrep#332.result

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
1+
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
2+
connection node_1;
13
CREATE TABLE p (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
24
CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id INTEGER) ENGINE=INNODB;
35
INSERT INTO p VALUES (1, 0);
46
INSERT INTO p VALUES (2, 0);
57
INSERT INTO c VALUES (1, 1);
68
INSERT INTO c VALUES (2, 2);
9+
connection node_1;
710
SET AUTOCOMMIT=ON;
811
START TRANSACTION;
912
UPDATE p SET f1 = f1 + 100;
13+
connection node_1a;
1014
SET SESSION wsrep_sync_wait = 0;
1115
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
16+
connection node_2;
1217
ALTER TABLE c ADD FOREIGN KEY (p_id) REFERENCES p(f1);
18+
connection node_1a;
1319
SET SESSION wsrep_on = 0;
1420
SET SESSION wsrep_on = 1;
1521
SET GLOBAL wsrep_provider_options = 'dbug=';
1622
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
23+
connection node_1;
1724
COMMIT;
25+
connection node_1a;
1826
SET SESSION wsrep_on = 0;
1927
SET SESSION wsrep_on = 1;
2028
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
2129
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
2230
SET GLOBAL wsrep_provider_options = 'dbug=';
23-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
31+
connection node_1;
32+
ERROR 40001: Deadlock: wsrep aborted transaction
33+
connection node_2;
2434
SELECT * FROM p;
2535
f1 f2
2636
1 0
@@ -31,30 +41,39 @@ f1 p_id
3141
2 2
3242
DROP TABLE c;
3343
DROP TABLE p;
44+
connection node_1;
3445
CREATE TABLE p1 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
3546
CREATE TABLE p2 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
3647
CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id1 INTEGER, p_id2 INTEGER) ENGINE=INNODB;
3748
INSERT INTO p1 VALUES (1, 0), (2, 0);
3849
INSERT INTO p2 VALUES (1, 0), (2, 0);
3950
INSERT INTO c VALUES (1, 1, 1);
4051
INSERT INTO c VALUES (2, 2, 2);
52+
connection node_1;
4153
SET AUTOCOMMIT=ON;
4254
START TRANSACTION;
4355
UPDATE p1 SET f1 = f1 + 100;
56+
connection node_1a;
4457
SET SESSION wsrep_sync_wait = 0;
4558
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
59+
connection node_2;
4660
ALTER TABLE c ADD FOREIGN KEY (p_id1) REFERENCES p1(f1), ADD FOREIGN KEY (p_id2) REFERENCES p2(f1);
61+
connection node_1a;
4762
SET SESSION wsrep_on = 0;
4863
SET SESSION wsrep_on = 1;
4964
SET GLOBAL wsrep_provider_options = 'dbug=';
5065
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
66+
connection node_1;
5167
COMMIT;
68+
connection node_1a;
5269
SET SESSION wsrep_on = 0;
5370
SET SESSION wsrep_on = 1;
5471
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
5572
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
5673
SET GLOBAL wsrep_provider_options = 'dbug=';
57-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
74+
connection node_1;
75+
ERROR 40001: Deadlock: wsrep aborted transaction
76+
connection node_2;
5877
SELECT * FROM p1;
5978
f1 f2
6079
1 0
@@ -70,30 +89,39 @@ f1 p_id1 p_id2
7089
DROP TABLE c;
7190
DROP TABLE p1;
7291
DROP TABLE p2;
92+
connection node_1;
7393
CREATE TABLE p1 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
7494
CREATE TABLE p2 (f1 INTEGER PRIMARY KEY, f2 INTEGER) ENGINE=INNODB;
7595
CREATE TABLE c (f1 INTEGER PRIMARY KEY, p_id1 INTEGER, p_id2 INTEGER) ENGINE=INNODB;
7696
INSERT INTO p1 VALUES (1, 0), (2, 0);
7797
INSERT INTO p2 VALUES (1, 0), (2, 0);
7898
INSERT INTO c VALUES (1, 1, 1);
7999
INSERT INTO c VALUES (2, 2, 2);
100+
connection node_1;
80101
SET AUTOCOMMIT=ON;
81102
START TRANSACTION;
82103
UPDATE p2 SET f1 = f1 + 100;
104+
connection node_1a;
83105
SET SESSION wsrep_sync_wait = 0;
84106
SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync';
107+
connection node_2;
85108
ALTER TABLE c ADD FOREIGN KEY (p_id1) REFERENCES p1(f1), ADD FOREIGN KEY (p_id2) REFERENCES p2(f1);
109+
connection node_1a;
86110
SET SESSION wsrep_on = 0;
87111
SET SESSION wsrep_on = 1;
88112
SET GLOBAL wsrep_provider_options = 'dbug=';
89113
SET GLOBAL wsrep_provider_options = 'dbug=d,local_monitor_enter_sync';
114+
connection node_1;
90115
COMMIT;
116+
connection node_1a;
91117
SET SESSION wsrep_on = 0;
92118
SET SESSION wsrep_on = 1;
93119
SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync';
94120
SET GLOBAL wsrep_provider_options = 'signal=local_monitor_enter_sync';
95121
SET GLOBAL wsrep_provider_options = 'dbug=';
96-
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
122+
connection node_1;
123+
ERROR 40001: Deadlock: wsrep aborted transaction
124+
connection node_2;
97125
SELECT * FROM p1;
98126
f1 f2
99127
1 0

0 commit comments

Comments
 (0)