From 953c326498813ec28627a630c011d090731b17d0 Mon Sep 17 00:00:00 2001 From: stack Date: Tue, 7 Apr 2020 10:22:24 -0700 Subject: [PATCH] HBASE-24126 Up the container nproc uplimit from 10000 to 12500 Addendum number 3; set the yetus proclimit. --- dev-support/hbase-personality.sh | 5 ++++- dev-support/hbase_nightly_yetus.sh | 2 +- dev-support/jenkins_precommit_github_yetus.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 58d2aa8266d..86998eafe31 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -81,8 +81,11 @@ function personality_globals # Yetus 0.7.0 enforces limits. Default proclimit is 1000. # Up it. See HBASE-19902 for how we arrived at this number. + # NOTE: I don't think changing this has an effect. Set the + # --proclimit passed to yetus. This seems to do what we + # need changing proclimit. #shellcheck disable=SC2034 - PROCLIMIT=10000 + PROCLIMIT=12500 # Set docker container to run with 20g. Default is 4g in yetus. # See HBASE-19902 for how we arrived at 20g. diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh index 11a44e0ff32..32724ba8da7 100755 --- a/dev-support/hbase_nightly_yetus.sh +++ b/dev-support/hbase_nightly_yetus.sh @@ -66,7 +66,7 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}") YETUS_ARGS=("--ignore-unknown-options=true" "${YETUS_ARGS[@]}") # Why are these not being picked up from hbase-personality? -YETUS_ARGS=("--proclimit=10000" "${YETUS_ARGS[@]}") +YETUS_ARGS=("--proclimit=12500" "${YETUS_ARGS[@]}") YETUS_ARGS=("--dockermemlimit=20g" "${YETUS_ARGS[@]}") if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then diff --git a/dev-support/jenkins_precommit_github_yetus.sh b/dev-support/jenkins_precommit_github_yetus.sh index e0ead27f0ab..a1d57204b75 100755 --- a/dev-support/jenkins_precommit_github_yetus.sh +++ b/dev-support/jenkins_precommit_github_yetus.sh @@ -102,7 +102,7 @@ YETUS_ARGS+=("--reapermode=kill") # set relatively high limits for ASF machines # changing these to higher values may cause problems # with other jobs on systemd-enabled machines -YETUS_ARGS+=("--proclimit=10000") +YETUS_ARGS+=("--proclimit=12500") YETUS_ARGS+=("--dockermemlimit=20g") # -1 spotbugs issues that show up prior to the patch being applied YETUS_ARGS+=("--spotbugs-strict-precheck")