Skip to content

Commit 049d696

Browse files
ahmadelyousseffacebook-github-bot
authored andcommitted
Fix broken DCPerf Sandcastle CI tests
Differential Revision: D113446225
1 parent 1d9c520 commit 049d696

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

packages/django_workload/install_django_workload_x86_64_centos.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,12 @@ if [ "$VERSION_ID" -ge 10 ]; then
224224
sed -i '/UseBiasedLocking/d' "${CASSANDRA_ROOT}/conf/jvm.options"
225225
sed -i '/UseCondCardMark/d' "${CASSANDRA_ROOT}/conf/jvm.options"
226226
sed -i '/ParGCCardsPerStrideChunk/d' "${CASSANDRA_ROOT}/conf/jvm.options"
227+
fi
227228

228-
# Allow deprecated Security Manager for Cassandra on Java 21+
229+
# Allow deprecated Security Manager for Cassandra on Java 17+
230+
JAVA_MAJOR_VERSION=$(java -version 2>&1 | head -1 | sed 's/.*"\([0-9]*\).*/\1/')
231+
if [ "$JAVA_MAJOR_VERSION" -ge 17 ] 2>/dev/null; then
229232
echo '-Djava.security.manager=allow' >> "${CASSANDRA_ROOT}/conf/jvm.options"
230-
# Cassandra 5.x uses jvm-server.options
231233
if [ -f "${CASSANDRA_ROOT}/conf/jvm-server.options" ]; then
232234
echo '-Djava.security.manager=allow' >> "${CASSANDRA_ROOT}/conf/jvm-server.options"
233235
fi
@@ -268,6 +270,11 @@ pushd "${DJANGO_SERVER_ROOT}"
268270

269271
# Install python3.14
270272
if ! [ -d Python-3.14.2 ]; then
273+
dnf reinstall -y zlib-devel || dnf install -y zlib-ng-compat-devel || dnf install -y zlib-devel
274+
dnf install -y libzstd-devel
275+
if [ ! -e /usr/lib64/libz.so ] && [ -e /usr/lib64/libz.so.1 ]; then
276+
ln -sf /usr/lib64/libz.so.1 /usr/lib64/libz.so
277+
fi
271278
wget https://www.python.org/ftp/python/3.14.2/Python-3.14.2.tgz
272279
tar -xzf Python-3.14.2.tgz
273280
cd Python-3.14.2
@@ -302,6 +309,10 @@ echo "====================================================================="
302309
# Using meta/3.14 branch — includes gh-145615 mimalloc page leak fix
303310
CINDER_COMMIT="7627b90844073b94ef60415ed1f1248837bedef7"
304311
if ! [ -d "cinder" ]; then
312+
dnf reinstall -y zlib-devel || dnf install -y zlib-ng-compat-devel || dnf install -y zlib-devel
313+
if [ ! -e /usr/lib64/libz.so ] && [ -e /usr/lib64/libz.so.1 ]; then
314+
ln -sf /usr/lib64/libz.so.1 /usr/lib64/libz.so
315+
fi
305316
git clone https://github.com/facebookincubator/cinder.git
306317
pushd cinder
307318
git checkout "${CINDER_COMMIT}"
@@ -492,6 +503,10 @@ fi
492503

493504
# Install CinderX in Cinder virtual environment (already activated)
494505
cd "${DJANGO_SERVER_ROOT}/cinderx"
506+
dnf reinstall -y zlib-devel || dnf install -y zlib-ng-compat-devel || dnf install -y zlib-devel
507+
if [ ! -e /usr/lib64/libz.so ] && [ -e /usr/lib64/libz.so.1 ]; then
508+
ln -sf /usr/lib64/libz.so.1 /usr/lib64/libz.so
509+
fi
495510
# Python 3.12+ venvs no longer include setuptools by default.
496511
# CinderX uses setuptools.build_meta as its build backend, so we must
497512
# install it explicitly before --no-build-isolation.

0 commit comments

Comments
 (0)