diff --git a/packages/django_workload/install_django_workload_aarch64_ubuntu22.sh b/packages/django_workload/install_django_workload_aarch64_ubuntu22.sh index f248a64e..a66334c9 100755 --- a/packages/django_workload/install_django_workload_aarch64_ubuntu22.sh +++ b/packages/django_workload/install_django_workload_aarch64_ubuntu22.sh @@ -213,6 +213,9 @@ cp "${TEMPLATES_DIR}/jvm.options" "${CASSANDRA_ROOT}/conf/jvm.options" || exit 1 mkdir -p /data/cassandra/{commitlog,data,saved_caches,hints}/ chmod -R 0700 /data/cassandra +# Create logs directory for Cassandra GC logs +mkdir -p "${CASSANDRA_ROOT}/logs" + # Copy configurations cp "${TEMPLATES_DIR}/cassandra.yaml" "${CASSANDRA_ROOT}/conf/cassandra.yaml.template" || exit 1 popd @@ -232,6 +235,10 @@ pushd "${DJANGO_SERVER_ROOT}" # Ubuntu 22 comes with python3.10, so we use system python echo "Using system Python 3.10" +# Create directory and symlink so the install marker check passes +mkdir -p "${DJANGO_SERVER_ROOT}/Python-3.10.2/python-build/bin" +ln -sf /usr/bin/python3.10 "${DJANGO_SERVER_ROOT}/Python-3.10.2/python-build/bin/python3.10" + echo "CPython 3.10 ready" # ===================================================================== diff --git a/packages/django_workload/install_django_workload_x86_64_ubuntu22.sh b/packages/django_workload/install_django_workload_x86_64_ubuntu22.sh index 6885f2ad..700da8a3 100755 --- a/packages/django_workload/install_django_workload_x86_64_ubuntu22.sh +++ b/packages/django_workload/install_django_workload_x86_64_ubuntu22.sh @@ -210,6 +210,9 @@ cp "${TEMPLATES_DIR}/jvm.options" "${CASSANDRA_ROOT}/conf/jvm.options" || exit 1 mkdir -p /data/cassandra/{commitlog,data,saved_caches,hints}/ chmod -R 0700 /data/cassandra +# Create logs directory for Cassandra GC logs +mkdir -p "${CASSANDRA_ROOT}/logs" + # Copy configurations cp "${TEMPLATES_DIR}/cassandra.yaml" "${CASSANDRA_ROOT}/conf/cassandra.yaml.template" || exit 1 popd @@ -229,6 +232,11 @@ pushd "${DJANGO_SERVER_ROOT}" # Ubuntu 22 comes with python3.10, so we use system python echo "Using system Python 3.10" + +# Create directory and symlink so the install marker check passes +mkdir -p "${DJANGO_SERVER_ROOT}/Python-3.10.2/python-build/bin" +ln -sf /usr/bin/python3.10 "${DJANGO_SERVER_ROOT}/Python-3.10.2/python-build/bin/python3.10" + echo "CPython 3.10 ready" # ===================================================================== diff --git a/packages/django_workload/templates/build_proxygen.sh b/packages/django_workload/templates/build_proxygen.sh index b2a4202d..a948e985 100755 --- a/packages/django_workload/templates/build_proxygen.sh +++ b/packages/django_workload/templates/build_proxygen.sh @@ -542,6 +542,34 @@ function setup_wangle() { cd "$BWD" || exit } +function setup_cares() { + CARES_DIR=$DEPS_DIR/c-ares + CARES_BUILD_DIR=$DEPS_DIR/c-ares/build/ + CARES_TAG="v1.34.4" + if [ ! -d "$CARES_DIR" ] ; then + echo -e "${COLOR_GREEN}[ INFO ] Cloning c-ares repo ${COLOR_OFF}" + git clone https://github.com/c-ares/c-ares.git "$CARES_DIR" + fi + cd "$CARES_DIR" + git fetch --tags + git checkout "${CARES_TAG}" + echo -e "${COLOR_GREEN}Building c-ares ${COLOR_OFF}" + mkdir -p "$CARES_BUILD_DIR" + cd "$CARES_BUILD_DIR" || exit + + cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_PREFIX_PATH="$DEPS_DIR" \ + -DCMAKE_INSTALL_PREFIX="$DEPS_DIR" \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DCARES_BUILD_TESTS=OFF \ + -DCARES_BUILD_TOOLS=OFF \ + .. + make -j "$JOBS" + make install + echo -e "${COLOR_GREEN}c-ares is installed ${COLOR_OFF}" + cd "$BWD" || exit +} + function setup_mvfst() { MVFST_DIR=$DEPS_DIR/mvfst MVFST_BUILD_DIR=$DEPS_DIR/mvfst/build/ @@ -672,6 +700,7 @@ setup_libaegis setup_fizz setup_wangle setup_mvfst +setup_cares MAYBE_BUILD_FUZZERS="" MAYBE_USE_STATIC_DEPS=""