Skip to content

Commit 0f8620f

Browse files
author
Andrzej Religa
committed
Bug#35612113 Bootstrap and metadata-cache data models in the trace files differ.
The bootstrap and the metadata-cache component tests set the metadata in different way in tracefiles (different json field names etc.) There is no reason for a difference there as this is the same metadata schema both those test groups are setting. It is hard to follow, maintain and extend. This patch unifies the data set by the bootstrap and metadata-cache component tests in the tracefiles for mock servers. Change-Id: Iaedc9368cdb83c86a88e965f03c7e19a99883741
1 parent 51c1e05 commit 0f8620f

29 files changed

+167
-244
lines changed

‎router/tests/component/data/bootstrap_failover_at_crash.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
4+
if (mysqld.global.cluster_nodes === undefined) {
5+
mysqld.global.cluster_nodes = [];
6+
}
57

68
var options = {
79
innodb_cluster_name: mysqld.global.cluster_name,
8-
replication_group_members: gr_members,
9-
innodb_cluster_instances: gr_members,
10+
innodb_cluster_instances: gr_memberships.cluster_nodes(
11+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1012
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1113
};
1214

‎router/tests/component/data/bootstrap_failover_at_crash_v1.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
5-
64
var options = {
75
metadata_schema_version: [1, 0, 2],
86
innodb_cluster_name: mysqld.global.cluster_name,
9-
replication_group_members: gr_members,
10-
innodb_cluster_instances: gr_members,
7+
replication_group_members: gr_memberships.gr_members(
8+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
9+
innodb_cluster_instances: gr_memberships.cluster_nodes(
10+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1111
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1212
};
1313

‎router/tests/component/data/bootstrap_failover_at_grant_ar.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
5-
64
var options = {
75
cluster_type: "ar",
8-
96
innodb_cluster_name: mysqld.global.cluster_name,
10-
innodb_cluster_instances: gr_members,
7+
innodb_cluster_instances: gr_memberships.cluster_nodes(
8+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
119
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1210
};
1311

‎router/tests/component/data/bootstrap_failover_at_grant_gr.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
5-
64
var options = {
75
cluster_type: "gr",
86
gr_id: mysqld.global.gr_id,
97
innodb_cluster_name: mysqld.global.cluster_name,
10-
replication_group_members: gr_members,
8+
replication_group_members: gr_memberships.gr_members(
9+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
1110
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1211
};
1312

‎router/tests/component/data/bootstrap_failover_at_grant_gr_v1.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
5-
64
var options = {
75
metadata_schema_version: [1, 0, 2],
86
cluster_type: "gr",
97
innodb_cluster_name: mysqld.global.cluster_name,
10-
replication_group_members: gr_members,
8+
replication_group_members: gr_memberships.gr_members(
9+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
1110
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1211
};
1312

‎router/tests/component/data/bootstrap_failover_at_show_warnings.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
5-
64
var options = {
75
innodb_cluster_name: mysqld.global.cluster_name,
8-
replication_group_members: gr_members,
6+
replication_group_members: gr_memberships.gr_members(
7+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
98
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
109
};
1110

‎router/tests/component/data/bootstrap_failover_reconfigure_ok.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
4+
if (mysqld.global.cluster_nodes === undefined) {
5+
mysqld.global.cluster_nodes = [];
6+
}
67

78
var options = {
89
gr_id: mysqld.global.gr_id,
910
innodb_cluster_name: mysqld.global.cluster_name,
10-
replication_group_members: gr_members,
11-
innodb_cluster_instances: gr_members,
11+
replication_group_members: gr_memberships.gr_members(
12+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
13+
innodb_cluster_instances: gr_memberships.cluster_nodes(
14+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1215
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1316
};
1417

‎router/tests/component/data/bootstrap_failover_reconfigure_ok_v1.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
var options = {
85
metadata_schema_version: [1, 0, 2],
96
gr_id: mysqld.global.gr_id,
107
innodb_cluster_name: mysqld.global.cluster_name,
11-
replication_group_members: gr_members,
12-
innodb_cluster_instances: gr_members,
8+
replication_group_members: gr_memberships.gr_members(
9+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
10+
innodb_cluster_instances: gr_memberships.cluster_nodes(
11+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1312
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1413
};
1514

‎router/tests/component/data/bootstrap_failover_super_read_only_1_ar.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
if (mysqld.global.gr_id === undefined) {
85
mysqld.global.gr_id = "CLUSTER-ID";
96
}
@@ -12,7 +9,8 @@ var options = {
129
cluster_id: mysqld.global.gr_id,
1310
cluster_type: "ar",
1411
innodb_cluster_name: mysqld.global.cluster_name,
15-
innodb_cluster_instances: gr_members,
12+
innodb_cluster_instances: gr_memberships.cluster_nodes(
13+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1614
};
1715

1816
var common_responses = common_stmts.prepare_statement_responses(

‎router/tests/component/data/bootstrap_failover_super_read_only_1_gr.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
var options = {
85
cluster_type: "gr",
96
innodb_cluster_name: mysqld.global.cluster_name,
10-
innodb_cluster_instances: mysqld.global.innodb_cluster_instances,
117
gr_id: mysqld.global.gr_id,
12-
replication_group_members: gr_members,
8+
replication_group_members: gr_memberships.gr_members(
9+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
10+
innodb_cluster_instances: gr_memberships.cluster_nodes(
11+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1312
};
1413

1514
var common_responses = common_stmts.prepare_statement_responses(

‎router/tests/component/data/bootstrap_failover_super_read_only_1_gr_v1.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
if (mysqld.global.gr_id === undefined) {
85
mysqld.global.gr_id = "CLUSTER-ID";
96
}
107

8+
if (mysqld.global.gr_nodes === undefined) {
9+
mysqld.global.gr_nodes = [];
10+
}
11+
12+
if (mysqld.global.cluster_nodes === undefined) {
13+
mysqld.global.cluster_nodes = [];
14+
}
15+
1116
var options = {
1217
metadata_schema_version: [1, 0, 2],
1318
gr_id: mysqld.global.gr_id,
1419
cluster_type: "gr",
1520
innodb_cluster_name: mysqld.global.cluster_name,
16-
replication_group_members: gr_members,
17-
innodb_cluster_instances:
18-
[["127.0.0.1", 13001], ["127.0.0.1", 13002], ["127.0.0.1", 13003]]
21+
replication_group_members: gr_memberships.gr_members(
22+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
23+
innodb_cluster_instances: gr_memberships.cluster_nodes(
24+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1925
};
2026

2127
var common_responses = common_stmts.prepare_statement_responses(

‎router/tests/component/data/bootstrap_failover_super_read_only_dead_2nd_1_ar.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
4+
if (mysqld.global.cluster_nodes === undefined) {
5+
mysqld.global.cluster_nodes = [];
6+
}
67

78
var options = {
89
cluster_type: "ar",
910

1011
innodb_cluster_name: mysqld.global.cluster_name,
1112

12-
innodb_cluster_instances: gr_members,
13+
innodb_cluster_instances: gr_memberships.cluster_nodes(
14+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1315
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1416
};
1517

‎router/tests/component/data/bootstrap_failover_super_read_only_dead_2nd_1_gr.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
var options = {
85
cluster_type: "gr",
96
gr_id: mysqld.global.gr_id,
107
innodb_cluster_name: mysqld.global.cluster_name,
11-
replication_group_members: gr_members,
12-
innodb_cluster_instances: gr_members,
8+
replication_group_members: gr_memberships.gr_members(
9+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
10+
innodb_cluster_instances: gr_memberships.cluster_nodes(
11+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1312
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1413
};
1514

‎router/tests/component/data/bootstrap_failover_super_read_only_dead_2nd_1_gr_v1.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4+
if (mysqld.global.gr_nodes === undefined) {
5+
mysqld.global.gr_nodes = [];
6+
}
47

5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
8+
if (mysqld.global.cluster_nodes === undefined) {
9+
mysqld.global.cluster_nodes = [];
10+
}
611

712
var options = {
813
metadata_schema_version: [1, 0, 2],
914
cluster_type: "gr",
1015
gr_id: mysqld.global.gr_id,
1116
innodb_cluster_name: mysqld.global.cluster_name,
12-
replication_group_members: gr_members,
13-
14-
innodb_cluster_instances:
15-
[["127.0.0.1", 13001], ["127.0.0.1", 13002], ["127.0.0.1", 13003]],
17+
replication_group_members: gr_memberships.gr_members(
18+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
19+
innodb_cluster_instances: gr_memberships.cluster_nodes(
20+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1621
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1722
};
1823

‎router/tests/component/data/bootstrap_failover_super_read_only_delete_user_ar.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
var options = {
85
cluster_type: "ar",
96

107
innodb_cluster_name: mysqld.global.cluster_name,
11-
innodb_cluster_instances: gr_members,
8+
innodb_cluster_instances: gr_memberships.cluster_nodes(
9+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1210
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1311
innodb_cluster_user_hosts: [["foo"], ["bar"], ["baz"]],
1412
};

‎router/tests/component/data/bootstrap_failover_super_read_only_delete_user_gr.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
var common_stmts = require("common_statements");
22
var gr_memberships = require("gr_memberships");
33

4-
5-
var gr_members = gr_memberships.members(mysqld.global.gr_members);
6-
74
var options = {
85
cluster_type: "gr",
96
gr_id: mysqld.global.gr_id,
107
innodb_cluster_name: mysqld.global.cluster_name,
11-
replication_group_members: gr_members,
12-
innodb_cluster_instances: gr_members,
8+
replication_group_members: gr_memberships.gr_members(
9+
mysqld.global.gr_node_host, mysqld.global.gr_nodes),
10+
innodb_cluster_instances: gr_memberships.cluster_nodes(
11+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1312
innodb_cluster_hosts: [[8, "dont.query.dns", null]],
1413
innodb_cluster_user_hosts: [["foo"], ["bar"], ["baz"]],
1514
};

‎router/tests/component/data/bootstrap_gr.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
var common_stmts = require("common_statements");
2+
var gr_memberships = require("gr_memberships");
23

3-
if (mysqld.global.innodb_cluster_instances === undefined) {
4-
mysqld.global.innodb_cluster_instances = [
5-
["5500", "localhost", 5500], ["5510", "localhost", 5510],
6-
["5520", "localhost", 5520]
7-
];
4+
if (mysqld.global.gr_node_host === undefined) {
5+
mysqld.global.gr_node_host = "127.0.0.1";
6+
}
7+
8+
if (mysqld.global.cluster_nodes === undefined) {
9+
mysqld.global.cluster_nodes =
10+
[["uuid-1", 5500], ["uuid-2", 5510], ["uuid-3", 5520]];
811
}
912

1013
if (mysqld.global.cluster_name == undefined) {
1114
mysqld.global.cluster_name = "mycluster";
1215
}
1316

1417
if (mysqld.global.metadata_schema_version === undefined) {
15-
mysqld.global.metadata_schema_version = [2, 0, 3];
18+
mysqld.global.metadata_schema_version = [2, 2, 0];
1619
}
1720

1821
if (mysqld.global.gr_id === undefined) {
@@ -25,7 +28,8 @@ var options = {
2528
gr_id: mysqld.global.gr_id,
2629
clusterset_present: 0,
2730
innodb_cluster_name: mysqld.global.cluster_name,
28-
innodb_cluster_instances: mysqld.global.innodb_cluster_instances,
31+
innodb_cluster_instances: gr_memberships.cluster_nodes(
32+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
2933
};
3034

3135
var common_responses = common_stmts.prepare_statement_responses(

‎router/tests/component/data/bootstrap_gr_dup_router.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var common_stmts = require("common_statements");
2+
var gr_memberships = require("gr_memberships");
23

3-
if (mysqld.global.innodb_cluster_instances === undefined) {
4-
mysqld.global.innodb_cluster_instances = [
4+
if (mysqld.global.cluster_nodes === undefined) {
5+
mysqld.global.cluster_nodes = [
56
["uuid-1", "localhost", 5500], ["uuid-2", "localhost", 5510],
67
["uuid-3", "localhost", 5520]
78
];
@@ -15,7 +16,8 @@ var options = {
1516
cluster_type: "gr",
1617
gr_id: mysqld.global.gr_id,
1718
innodb_cluster_name: mysqld.global.cluster_name,
18-
innodb_cluster_instances: mysqld.global.innodb_cluster_instances,
19+
innodb_cluster_instances: gr_memberships.cluster_nodes(
20+
mysqld.global.gr_node_host, mysqld.global.cluster_nodes),
1921
};
2022

2123
var common_responses = common_stmts.prepare_statement_responses(

0 commit comments

Comments
 (0)