Skip to content

MDBF-1110 install/upgrade tests in Buildot contain work arounds for fixed bugs #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: dev
Choose a base branch
from
Draft

MDBF-1110 install/upgrade tests in Buildot contain work arounds for fixed bugs #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fab28b
Run columnstore upgrade on specified architectures only
grooverdan Aug 27, 2025
ad87f51
MDBF-1110 remove special handling for MCOL-4120 that is resolved
grooverdan Aug 27, 2025
63b60e2
deb-upgrade: no more tokudb
grooverdan Aug 27, 2025
0026c8d
MDBF-1110 remove special handling - deb-upgrade - spider separated
grooverdan Aug 27, 2025
0e79054
deb-upgrade: since 10.1(?) there is no separeate mariadb-galera-serve…
grooverdan Aug 27, 2025
528a1c4
MDBF-1110 remove special handling for rpm-upgrade -MCOL-4120 fixed
grooverdan Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,13 @@
if arch not in ["s390x", "x86"]:
BUILDERS_INSTALL.append(builder_name_autobake + "-install")
BUILDERS_UPGRADE.append(builder_name_autobake + "-minor-upgrade-all")
BUILDERS_UPGRADE.append(
builder_name_autobake + "-minor-upgrade-columnstore"
)
BUILDERS_UPGRADE.append(builder_name_autobake + "-major-upgrade")
BUILDERS_UPGRADE.append(builder_name_autobake + "-distro-upgrade")

if arch in ["amd64", "aarch64"]:
Copy link
Collaborator

@RazvanLiviuVarzaru RazvanLiviuVarzaru Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I my understanding correct that columnstore packages are not built for ppc64le as per server configuration?

Copy link
Member Author

@grooverdan grooverdan Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

BUILDERS_UPGRADE.append(
builder_name_autobake + "-minor-upgrade-columnstore"
)
BUILDERS_GALERA = list(
map(lambda x: "gal-" + "-".join(x.split("-")[:3]), BUILDERS_AUTOBAKE)
)
29 changes: 0 additions & 29 deletions scripts/deb-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,8 @@ get_packages_file_mirror() {
case $test_mode in
all)
get_packages_file_mirror
if grep -qi columnstore Packages; then
bb_log_warn "due to MCOL-4120 (Columnstore leaves the server shut down)"
bb_log_warn "and other bugs Columnstore upgrade is tested separately"
fi
package_list=$(grep "^Package:" Packages |
grep -vE 'galera|spider|columnstore' |
awk '{print $2}' | sort -u | xargs)
if grep -qi spider Packages; then
bb_log_warn "due to MDEV-14622 Spider will be installed separately after the server"
spider_package_list=$(grep "^Package:" Packages |
grep 'spider' | awk '{print $2}' |
sort -u | xargs)
fi
if grep -si tokudb Packages; then
Copy link
Collaborator

@RazvanLiviuVarzaru RazvanLiviuVarzaru Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be useful to link the MDEV / commit that removed TokuDB.

Copy link
Member Author

@grooverdan grooverdan Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MDEV-19780 Remove the TokuDB storage engine (for 10.6). there was a disable for an earlier version.

# For the sake of installing TokuDB, disable hugepages
sudo sh -c "echo never > /sys/kernel/mm/transparent_hugepage/enabled" || true
fi
;;
deps)
package_list="mariadb-server mariadb-client mariadb-common mariadb-test mysql-common libmysqlclient18"
Expand All @@ -79,11 +64,6 @@ case $test_mode in
package_list=mariadb-server
;;
columnstore)
get_packages_file_mirror
Copy link
Collaborator

@RazvanLiviuVarzaru RazvanLiviuVarzaru Sep 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this test is useful, if it exists with an error.
Imagine on the server development side or when configuring the buildbot docker environment,
a mistake is made and columnstore packages are no longer generated.

Copy link
Member Author

@grooverdan grooverdan Sep 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An error is good. This would have failed with cannot install columnstore at a later step, like any other failure to generate package, that is in the package list below.

if ! grep columnstore Packages >/dev/null; then
bb_log_warn "Columnstore was not found in packages, the test will not be run"
exit
fi
package_list="mariadb-server mariadb-plugin-columnstore"
;;
*)
Expand Down Expand Up @@ -122,15 +102,6 @@ fi

wait_for_mariadb_upgrade

if [[ -n $spider_package_list ]]; then
if ! sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list"; then
bb_log_err "Installation of Spider from the previous release failed, see the output above"
exit 1
fi
wait_for_mariadb_upgrade
fi

# To avoid confusing errors in further logic, do an explicit check
# whether the service is up and running
if [[ $systemdCapability == "yes" ]]; then
Expand Down
3 changes: 0 additions & 3 deletions scripts/rpm-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ case $test_mode in
# retrieve full package list from repo
package_list=$(rpm_repoquery) ||
bb_log_err "unable to retrieve package list from repository"
package_list=$(echo "$package_list" | grep -viE 'galera|columnstore')
alternative_names_package_list=$package_list
bb_log_warn "Due to MCOL-4120 and other issues, Columnstore upgrade will be tested separately"
;;
server)
package_list="MariaDB-server MariaDB-client"
Expand Down