Skip to content

Commit 7a07dff

Browse files
VarunNagarajuVarunNagaraju
committed
Bug#31981993 FIXES CONFIGURATION FILE FOR UPGRADE TESTS FROM 7.3
Renames 'conf-upgrade-vigdis05.cnf' to 'conf-upgrade.cnf' thereby replacing the old conf-upgrade.cnf. Before Autotest infrastructure was migrated to OCI, conf-upgrade-vigdis05.cnf was being picked up for upgrade tests from 7.3. After, migration to OCI, Autotest started to pick up conf-upgrade.cnf which had different configuration for mysqld and cluster configuration only for 2 node cluster leading upgrade combinations from 7.3 to fail. So, conf-upgrade-vigdis05.cnf is removed and the appropriate configurations are updated in conf-upgrade.cnf. Reviewed by: Paulo Silva <paulo.p.silva@oracle.com>
1 parent c0bf653 commit 7a07dff

File tree

2 files changed

+137
-196
lines changed

2 files changed

+137
-196
lines changed

‎storage/ndb/test/run-test/conf-upgrade-vigdis05.cnf

Lines changed: 0 additions & 173 deletions
This file was deleted.

‎storage/ndb/test/run-test/conf-upgrade.cnf

Lines changed: 137 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,173 @@
1-
# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
4-
# it under the terms of the GNU General Public License, version 2.0,
5-
# as published by the Free Software Foundation.
6-
#
7-
# This program is also distributed with certain software (including
8-
# but not limited to OpenSSL) that is licensed under separate terms,
9-
# as designated in a particular file or component or in included license
10-
# documentation. The authors of MySQL hereby grant you an additional
11-
# permission to link the program and your derivative works with the
12-
# separately licensed software that they have included with MySQL.
4+
# it under the terms of the GNU General Public License as published by
5+
# the Free Software Foundation; version 2 of the License.
136
#
147
# This program is distributed in the hope that it will be useful,
158
# but WITHOUT ANY WARRANTY; without even the implied warranty of
169
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
# GNU General Public License, version 2.0, for more details.
10+
# GNU General Public License for more details.
1811
#
1912
# You should have received a copy of the GNU General Public License
2013
# along with this program; if not, write to the Free Software
2114
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2215

2316
[atrt]
2417
basedir = CHOOSE_dir
25-
baseport = 14000
26-
clusters = .4node
18+
fix-nodeid = 1
19+
mt = 2
2720
mysqld = CHOOSE_host1
28-
fix-nodeid=1
29-
mt=2
3021

3122
[ndb_mgmd]
3223

3324
[mysqld]
3425
loose-default-authentication-plugin=mysql_native_password
3526
loose-mysqlx=0
36-
skip-innodb
37-
loose-skip-bdb
3827
socket=mysql.sock
3928
skip-grant-tables
40-
default-storage-engine=myisam
4129

4230
[client]
4331
protocol=tcp
4432

33+
#
34+
# .2node
35+
#
36+
37+
[cluster_config.2node]
38+
ndb_mgmd = CHOOSE_host1
39+
ndbd = CHOOSE_host2,CHOOSE_host3
40+
ndbapi= CHOOSE_host1,CHOOSE_host4,CHOOSE_host5
41+
42+
NoOfReplicas = 2
43+
IndexMemory = 100M
44+
DataMemory = 300M
45+
BackupMemory = 64M
46+
MaxNoOfConcurrentScans = 100
47+
MaxNoOfSavedMessages= 5
48+
SendBufferMemory = 2M
49+
NoOfFragmentLogFiles = 4
50+
FragmentLogFileSize = 128M
51+
CompressedLCP=1
52+
CompressedBackup=1
53+
ODirect=1
54+
MaxNoOfAttributes=2000
55+
56+
SharedGlobalMemory=256M
57+
InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:512M;undofile02.dat:512M
58+
InitialTablespace=datafile01.dat:128M;datafile02.dat:64M
59+
TimeBetweenWatchDogCheckInitial=60000
60+
61+
#
62+
# .2node8thr
63+
#
64+
65+
[cluster_config.2node8thr]
66+
ndb_mgmd = CHOOSE_host1
67+
ndbd = CHOOSE_host2,CHOOSE_host3
68+
ndbapi= CHOOSE_host1,CHOOSE_host4,CHOOSE_host5
69+
Checksum=1
70+
71+
NoOfReplicas = 2
72+
IndexMemory = 100M
73+
DataMemory = 500M
74+
BackupMemory = 64M
75+
MaxNoOfConcurrentScans = 100
76+
MaxNoOfSavedMessages= 5
77+
NoOfFragmentLogFiles = 8
78+
FragmentLogFileSize = 128M
79+
ODirect=1
80+
MaxNoOfExecutionThreads=8
81+
SendBufferMemory=4M
82+
MaxNoOfAttributes=2000
83+
84+
SharedGlobalMemory=256M
85+
DiskPageBufferMemory=256M
86+
InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:512M;undofile02.dat:512M
87+
InitialTablespace=datafile01.dat:256M;datafile02.dat:256M
88+
TimeBetweenWatchDogCheckInitial=60000
89+
90+
#
91+
# .4node
92+
#
93+
4594
[cluster_config.4node]
46-
ndb_mgmd = CHOOSE_host1,CHOOSE_host1
47-
ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host2,CHOOSE_host3
48-
ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1
95+
ndb_mgmd = CHOOSE_host1
96+
ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host4,CHOOSE_host5
97+
ndbapi= CHOOSE_host1,CHOOSE_host6,CHOOSE_host7
98+
99+
NoOfReplicas = 2
100+
IndexMemory = 100M
101+
DataMemory = 500M
102+
BackupMemory = 64M
103+
MaxNoOfConcurrentScans = 100
104+
MaxNoOfSavedMessages= 5
105+
NoOfFragmentLogFiles = 8
106+
FragmentLogFileSize = 128M
107+
ODirect=1
108+
MaxNoOfAttributes=2000
109+
110+
SharedGlobalMemory=256M
111+
DiskPageBufferMemory=256M
112+
#FileSystemPath=/data0/autotest
113+
#FileSystemPathDataFiles=/data1/autotest
114+
#FileSystemPathUndoFiles=/data2/autotest
115+
InitialLogfileGroup=undo_buffer_size=64M;undofile01.dat:512M;undofile02.dat:512M
116+
InitialTablespace=datafile01.dat:256M;datafile02.dat:256M
117+
TimeBetweenWatchDogCheckInitial=60000
118+
119+
#
120+
# .2node2mgm
121+
#
122+
123+
[cluster_config.2node2mgm]
124+
ndb_mgmd = CHOOSE_host1,CHOOSE_host6
125+
ndbd = CHOOSE_host2,CHOOSE_host3
126+
ndbapi= CHOOSE_host1,CHOOSE_host4,CHOOSE_host5
49127

50128
NoOfReplicas = 2
51-
IndexMemory = 50M
129+
IndexMemory = 50M
130+
DataMemory = 100M
131+
BackupMemory = 64M
132+
MaxNoOfConcurrentScans = 100
133+
MaxNoOfSavedMessages= 5
134+
NoOfFragmentLogFiles = 4
135+
FragmentLogFileSize = 64M
136+
137+
#
138+
# .2node8thr2mgm
139+
#
140+
141+
[cluster_config.2node8thr2mgm]
142+
ndb_mgmd = CHOOSE_host1,CHOOSE_host6
143+
ndbd = CHOOSE_host2,CHOOSE_host3
144+
ndbapi= CHOOSE_host1,CHOOSE_host4,CHOOSE_host5
145+
Checksum=1
146+
147+
NoOfReplicas = 2
148+
IndexMemory = 50M
52149
DataMemory = 100M
53150
BackupMemory = 64M
54151
MaxNoOfConcurrentScans = 100
55152
MaxNoOfSavedMessages= 5
56-
SendBufferMemory = 2M
57153
NoOfFragmentLogFiles = 4
58154
FragmentLogFileSize = 64M
155+
MaxNoOfExecutionThreads=8
156+
157+
#
158+
# .4node2mgm
159+
#
160+
161+
[cluster_config.4node2mgm]
162+
ndb_mgmd = CHOOSE_host1,CHOOSE_host8
163+
ndbd = CHOOSE_host2,CHOOSE_host3,CHOOSE_host4,CHOOSE_host5
164+
ndbapi= CHOOSE_host1,CHOOSE_host6,CHOOSE_host7
59165

166+
NoOfReplicas = 2
167+
IndexMemory = 50M
168+
DataMemory = 100M
169+
BackupMemory = 64M
170+
MaxNoOfConcurrentScans = 100
171+
MaxNoOfSavedMessages= 5
172+
NoOfFragmentLogFiles = 4
173+
FragmentLogFileSize = 64M

0 commit comments

Comments
 (0)