Merge pull request #196 from ubccr/release-2025-02

Bump slurm, mariadb, and mongo versions.

Author: aebruno

Diff for: .env

@@ -1,4 +1,4 @@
-HPCTS_VERSION="2023.07"
-SLURM_VERSION="21.08.8-2"
-MARIADB_VERSION=10.3
-MONGODB_VERSION=5.0
+HPCTS_VERSION="2025.02"
+SLURM_VERSION="24.05.5-1"
+MARIADB_VERSION=10.11.11
+MONGODB_VERSION=7.0

Diff for: base/install.sh

@@ -8,7 +8,7 @@ log_info() {
 }
 
 ARCHTYPE=`uname -m`
-GOSU_VERSION=${GOSU_VERSION:-1.12}
+GOSU_VERSION=${GOSU_VERSION:-1.17}
 
 log_info "HPCTS Base image for $ARCHTYPE"
 

Diff for: coldfront/install.sh

@@ -16,8 +16,7 @@ dnf install -y \
     nginx \
     openssl \
     openldap-devel \
-    redis \
-    mariadb-server
+    redis
 
 log_info "Creating coldfront system user account.."
 groupadd -r coldfront

Diff for: database/create-coldfront-db.sh

@@ -4,21 +4,21 @@ set -e
 trap 'ret=$?; test $ret -ne 0 && printf "failed\n\n" >&2; exit $ret' EXIT
 
 echo "Creating coldfront database.."
-mysql -uroot <<EOF
+mariadb -uroot <<EOF
 create database if not exists coldfront
 EOF
 
 echo "Creating coldront mysql user.."
-mysql -uroot <<EOF
+mariadb -uroot <<EOF
 create user 'coldfrontapp'@'%' identified by '9obCuAphabeg';
 EOF
 
 echo "Granting coldfront user access to coldfront database.."
-echo "grant all on coldfront.* to 'coldfrontapp'@'%';" | mysql -uroot
-echo "flush privileges;" | mysql -uroot
+echo "grant all on coldfront.* to 'coldfrontapp'@'%';" | mariadb -uroot
+echo "flush privileges;" | mariadb -uroot
 
 
 if [ -f "/docker-entrypoint-initdb.d/coldfront.dump" ]; then
     echo "Restoring coldfront database..."
-    mysql -uroot coldfront < /docker-entrypoint-initdb.d/coldfront.dump
+    mariadb -uroot coldfront < /docker-entrypoint-initdb.d/coldfront.dump
 fi

Diff for: database/create-slurm-db.sh

@@ -10,15 +10,15 @@ StorageUser=${StorageUser:-slurm}
 StoragePass=${StoragePass:-ilovelinux}
 
 echo "Creating slurm accounting database.."
-mysql -uroot <<EOF
+mariadb -uroot <<EOF
 create database if not exists $StorageLoc
 EOF
 
 echo "Creating $StorageUser mysql user.."
-mysql -uroot <<EOF
+mariadb -uroot <<EOF
 create user '$StorageUser'@'%' identified by '$StoragePass';
 EOF
 
 echo "Granting $StorageUser access to $StorageLoc.."
-echo "grant all on \`${StorageLoc//_/\\_}\`.* to '$StorageUser'@'%';" | mysql -uroot
-echo "flush privileges;" | mysql -uroot
+echo "grant all on \`${StorageLoc//_/\\_}\`.* to '$StorageUser'@'%';" | mariadb -uroot
+echo "flush privileges;" | mariadb -uroot

Diff for: database/create-xdmod-db.sh

@@ -4,29 +4,29 @@ set -e
 trap 'ret=$?; test $ret -ne 0 && printf "failed\n\n" >&2; exit $ret' EXIT
 
 echo "Creating xdmod mysql user.."
-mysql -uroot <<EOF
+mariadb -uroot <<EOF
 create user 'xdmodapp'@'%' identified by 'ofbatgorWep0';
 EOF
 
 if [ -f "/docker-entrypoint-initdb.d/xdmod.dump" ]; then
   echo "Restoring xdmod database..."
-  mysql -uroot < /docker-entrypoint-initdb.d/xdmod.dump
+  mariadb -uroot < /docker-entrypoint-initdb.d/xdmod.dump
   for db in mod_hpcdb mod_logger mod_shredder moddb modw modw_aggregates modw_filters modw_supremm modw_etl modw_jobefficiency modw_cloud modw_ondemand
     do
-        echo "grant all on $db.* to 'xdmodapp'@'%';" | mysql -uroot
+        echo "grant all on $db.* to 'xdmodapp'@'%';" | mariadb -uroot
     done
 
-    echo "flush privileges;" | mysql -uroot
+    echo "flush privileges;" | mariadb -uroot
 else
   echo "Creating xdmod databases.."
   for db in mod_hpcdb mod_logger mod_shredder moddb modw modw_aggregates modw_filters modw_supremm modw_etl modw_jobefficiency modw_cloud modw_ondemand
   do
       echo "Creating $db database.."
-      echo "create database if not exists $db" | mysql -uroot
-      echo "grant all on $db.* to 'xdmodapp'@'%';" | mysql -uroot
+      echo "create database if not exists $db" | mariadb -uroot
+      echo "grant all on $db.* to 'xdmodapp'@'%';" | mariadb -uroot
   done
 
-  echo "flush privileges;" | mysql -uroot
+  echo "flush privileges;" | mariadb -uroot
 fi
 
 

Diff for: database/slurm.cnf

@@ -0,0 +1,5 @@
+[mysqld]
+innodb_buffer_pool_size=4096M
+innodb_log_file_size=64M
+innodb_lock_wait_timeout=900
+max_allowed_packet=16M

Diff for: docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   ldap:
     image: ubccr/hpcts:ldap-${HPCTS_VERSION}

Diff for: mongodb/setup.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 echo "Creating mongo user accounts for use by XDMoD."
-mongo admin --host localhost -u admin -p hBbeOfpFLfFT5ZO --eval "db.createUser({user: 'xdmod', pwd: 'xsZ0LpZstneBpijLy7', roles: [{role: 'readWrite', db: 'supremm'}]}); db.createUser({user: 'xdmod-ro', pwd: 'OPsvjY4gxq74ZIbOrz', roles: [{role: 'read', db: 'supremm'}]});"
+mongosh admin --host localhost -u admin -p hBbeOfpFLfFT5ZO --eval "db.createUser({user: 'xdmod', pwd: 'xsZ0LpZstneBpijLy7', roles: [{role: 'readWrite', db: 'supremm'}]}); db.createUser({user: 'xdmod-ro', pwd: 'OPsvjY4gxq74ZIbOrz', roles: [{role: 'read', db: 'supremm'}]});"
 echo "Mongo users created."

Diff for: slurm/Dockerfile

@@ -12,6 +12,7 @@ ARG SLURM_VERSION
 COPY . /build
 RUN /build/install.sh && rm -rf /build
 COPY slurm.conf /etc/slurm/slurm.conf
+COPY cgroup.conf /etc/slurm/cgroup.conf
 COPY --chown=slurm:slurm slurmdbd.conf /etc/slurm/slurmdbd.conf
 RUN chmod 600 /etc/slurm/slurmdbd.conf
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh

Diff for: slurm/cgroup.conf

@@ -0,0 +1,7 @@
+CgroupPlugin=cgroup/v1
+
+ConstrainDevices=yes
+ConstrainCores=yes
+ConstrainRAMSpace=yes
+AllowedSwapSpace=5
+ConstrainSwapSpace=yes

Diff for: slurm/install.sh

@@ -7,8 +7,8 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-SLURM_VERSION=${SLURM_VERSION:-21.08.8-2}
-WEBSOCKIFY_VERSION=${WEBSOCKIFY_VERSION:-0.11.0}
+SLURM_VERSION=${SLURM_VERSION:-24.05.5}
+WEBSOCKIFY_VERSION=${WEBSOCKIFY_VERSION:-0.12.0}
 ARCHTYPE=$(uname -m)
 
 log_info "Installing required packages for building slurm.."

Diff for: slurm/slurm.conf

@@ -36,7 +36,7 @@ Waittime=0
 #
 # SCHEDULING
 SchedulerType=sched/backfill
-SelectType=select/cons_res
+SelectType=select/cons_tres
 SelectTypeParameters=CR_CPU_Memory
 
 #