From 8fab28b47e8972a74b3d7a7eddc43289d43c8818 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 28 Aug 2025 09:45:55 +1000 Subject: [PATCH 1/6] Run columnstore upgrade on specified architectures only This prevents a no-op on ppc64le --- constants.py | 7 ++++--- scripts/deb-upgrade.sh | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/constants.py b/constants.py index 6f08e72d..e6073378 100644 --- a/constants.py +++ b/constants.py @@ -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"]: + BUILDERS_UPGRADE.append( + builder_name_autobake + "-minor-upgrade-columnstore" + ) BUILDERS_GALERA = list( map(lambda x: "gal-" + "-".join(x.split("-")[:3]), BUILDERS_AUTOBAKE) ) diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh index 640b1cec..386b6fda 100755 --- a/scripts/deb-upgrade.sh +++ b/scripts/deb-upgrade.sh @@ -79,11 +79,6 @@ case $test_mode in package_list=mariadb-server ;; columnstore) - get_packages_file_mirror - 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" ;; *) From ad87f51d1c5a0d86db5ca1220e117468034c253b Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 28 Aug 2025 09:46:39 +1000 Subject: [PATCH 2/6] MDBF-1110 remove special handling for MCOL-4120 that is resolved --- scripts/deb-upgrade.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh index 386b6fda..235b15a6 100755 --- a/scripts/deb-upgrade.sh +++ b/scripts/deb-upgrade.sh @@ -54,12 +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' | + grep -vE 'galera|spider' | 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" From 63b60e2e7776b30c3344dac117cb068ee95c9253 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 28 Aug 2025 09:47:58 +1000 Subject: [PATCH 3/6] deb-upgrade: no more tokudb --- scripts/deb-upgrade.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh index 235b15a6..d95d15e6 100755 --- a/scripts/deb-upgrade.sh +++ b/scripts/deb-upgrade.sh @@ -63,10 +63,6 @@ case $test_mode in grep 'spider' | awk '{print $2}' | sort -u | xargs) fi - if grep -si tokudb Packages; then - # 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" From 0026c8d09e37deba86fa5d4d3a58c1f08f4573c2 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 28 Aug 2025 09:54:51 +1000 Subject: [PATCH 4/6] MDBF-1110 remove special handling - deb-upgrade - spider separated MDEV-14622 listed as resolved so remove special handling for spider. --- scripts/deb-upgrade.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh index d95d15e6..604f30d5 100755 --- a/scripts/deb-upgrade.sh +++ b/scripts/deb-upgrade.sh @@ -55,14 +55,8 @@ case $test_mode in all) get_packages_file_mirror package_list=$(grep "^Package:" Packages | - grep -vE 'galera|spider' | + grep -vE 'galera' | 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 ;; deps) package_list="mariadb-server mariadb-client mariadb-common mariadb-test mysql-common libmysqlclient18" @@ -109,15 +103,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 From 0e79054f087d49324777c154848841693a178e6b Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 28 Aug 2025 09:57:41 +1000 Subject: [PATCH 5/6] deb-upgrade: since 10.1(?) there is no separeate mariadb-galera-server package So there's no need for this filter. --- scripts/deb-upgrade.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh index 604f30d5..caa41708 100755 --- a/scripts/deb-upgrade.sh +++ b/scripts/deb-upgrade.sh @@ -55,7 +55,6 @@ case $test_mode in all) get_packages_file_mirror package_list=$(grep "^Package:" Packages | - grep -vE 'galera' | awk '{print $2}' | sort -u | xargs) ;; deps) From 528a1c4989cf415e80dd74cf6541f756e5f1e9f8 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 28 Aug 2025 10:24:59 +1000 Subject: [PATCH 6/6] MDBF-1110 remove special handling for rpm-upgrade -MCOL-4120 fixed Also galera part of package names hasn't existed since 10.1 days. --- scripts/rpm-upgrade.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/rpm-upgrade.sh b/scripts/rpm-upgrade.sh index 8904ea6e..3c7138ba 100755 --- a/scripts/rpm-upgrade.sh +++ b/scripts/rpm-upgrade.sh @@ -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"