Skip to content

Commit 0249386

Browse files
grooverdangrooverdan
committed
mariadb-upgrade: test improved and workaround removed
1 parent 9365916 commit 0249386

File tree

9 files changed

+9
-86
lines changed

9 files changed

+9
-86
lines changed

‎.test/run.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ fi
430430
runandwait -v m57:/var/lib/mysql:Z -e MYSQL_INITDB_SKIP_TZINFO=1 -e MYSQL_ROOT_PASSWORD=bob docker.io/library/mysql:5.7
431431
# clean shutdown required
432432
mariadbclient -u root -pbob -e "set global innodb_fast_shutdown=0;SHUTDOWN"
433-
while docker exec "$cid" ls -a /proc; do
433+
while docker exec "$cid" ls -lad /proc/1; do
434434
sleep 1
435435
done
436436

@@ -446,11 +446,6 @@ fi
446446

447447
docker exec "$cid" ls -la /var/lib/mysql/
448448

449-
# TODO, disable further tests until git branch --contains 0fd4d6d3bb77b9072305f0b1d5bebfb914ad55cc
450-
killoff
451-
docker volume rm m57
452-
exit 0
453-
# ENDOFTODO
454449
echo "Final upgrade info reflects current version?"
455450
docker exec "$cid" cat /var/lib/mysql/mysql_upgrade_info || die "missing mysql_upgrade_info on install"
456451
echo

‎10.2/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mysql_upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mysql_upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎10.3/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mysql_upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mysql_upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎10.4/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mysql_upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mysql_upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎10.5/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mysql_upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mysql_upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎10.6/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mariadb-upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mariadb-upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎10.7/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mariadb-upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mariadb-upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎10.8/docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mariadb-upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mariadb-upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

‎docker-entrypoint.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@ _mariadb_version() {
179179
echo -n "${mariaVersion}-MariaDB"
180180
}
181181

182-
_mariadb_fake_upgrade_info() {
183-
if [ ! -f "${DATADIR}"/mysql_upgrade_info ]; then
184-
_mariadb_version > "${DATADIR}"/mysql_upgrade_info
185-
fi
186-
}
187-
188182
# initializes the database directory
189183
docker_init_database_dir() {
190184
mysql_note "Initializing database files"
@@ -201,7 +195,6 @@ docker_init_database_dir() {
201195
--default-time-zone=SYSTEM --enforce-storage-engine= --skip-log-bin \
202196
--loose-innodb_buffer_pool_load_at_startup=0 \
203197
--loose-innodb_buffer_pool_dump_at_shutdown=0
204-
_mariadb_fake_upgrade_info
205198
mysql_note "Database files initialized"
206199
}
207200

@@ -403,9 +396,7 @@ docker_mariadb_upgrade() {
403396
docker_mariadb_backup_system
404397

405398
mysql_note "Starting mariadb-upgrade"
406-
mysql_upgrade --upgrade-system-tables || true # permission denied fixed in Jan 2022 release?
407-
# _mariadb_fake_upgrade_info Possibly fixed by MDEV-27068
408-
_mariadb_fake_upgrade_info
399+
mysql_upgrade --upgrade-system-tables
409400
mysql_note "Finished mariadb-upgrade"
410401

411402
# docker_temp_server_stop needs authentication since

0 commit comments

Comments
 (0)