[mesos] branch master updated: Added support for limiting mesos-tidy parallelism. (#428)

[cfnatali]

This is an automated email from the ASF dual-hosted git repository.

cfnatali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new f83a8fb98 Added support for limiting mesos-tidy parallelism. (#428)
f83a8fb98 is described below

commit f83a8fb98ac16cfb50ce88a05c18e0ed3adf5a00
Author: cf-natali <cf.nat...@gmail.com>
AuthorDate: Mon Apr 25 21:48:24 2022 +0100

    Added support for limiting mesos-tidy parallelism. (#428)
    
    Instead of seting the parallelism to the number of cores, allow it to be
    overwritten on an ad-hoc basis via the `JOBS` environment variable,
    similar to mesos-build.
    
    This is useful for example to avoid running OOM, which I suspect is
    what's happening on the Jenkins CI.
---
 support/mesos-tidy.sh            | 3 +++
 support/mesos-tidy/entrypoint.sh | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/support/mesos-tidy.sh b/support/mesos-tidy.sh
index b7e75f041..8696fd023 100755
--- a/support/mesos-tidy.sh
+++ b/support/mesos-tidy.sh
@@ -19,6 +19,8 @@
 set -e
 set -o pipefail
 
+: "${JOBS:=$(nproc)}"
+
 MESOS_DIR=$(git rev-parse --show-toplevel)
 
 # Check for unstaged or uncommitted changes.
@@ -36,4 +38,5 @@ docker run \
   -v "${MESOS_DIR}":/SRC:Z \
   -e CHECKS="${CHECKS}" \
   -e CMAKE_ARGS="${CMAKE_ARGS}" \
+  -e JOBS="${JOBS}" \
   mesos/mesos-tidy
diff --git a/support/mesos-tidy/entrypoint.sh b/support/mesos-tidy/entrypoint.sh
index 7dbde6873..269b94d76 100755
--- a/support/mesos-tidy/entrypoint.sh
+++ b/support/mesos-tidy/entrypoint.sh
@@ -33,9 +33,9 @@ cmake -DCMAKE_BUILD_TYPE=Release \
       ${CMAKE_ARGS} \
       "${SRCDIR}"
 
-# Set up CMake to run as many parallel build process as we have cores instead
-# of relying on the default parallelism of the particular build tool.
-export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc)
+# Specify CMake parallelism instead of relying on the default parallelism of
+# the particular build tool.
+export CMAKE_BUILD_PARALLEL_LEVEL="${JOBS}"
 
 # Build the external dependencies.
 # TODO(mpark): Use an external dependencies target once MESOS-6924 is resolved.
@@ -78,7 +78,7 @@ cat compile_commands.json \
   | sed 's/"//g' \
   | sed 's/^\ //g' \
   | grep "^${SRCDIR}/.*\.cpp$" \
-  | parallel -j $(nproc) clang-tidy -p "${PWD}" \
+  | parallel -j "${JOBS}" clang-tidy -p "${PWD}" \
       -extra-arg=-Wno-unknown-warning-option \
       -extra-arg=-Wno-unused-command-line-argument \
       -header-filter="^${SRCDIR}/.*\.hpp$" -checks="${CHECKS}" \