From 62a488b94647e4f69cfbe4d91086edbccb3b376a Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Mon, 13 Apr 2020 14:59:16 -0700 Subject: [PATCH] HBASE-24126 Up the container nproc uplimit from 10000 to 12500 (#1504) --- dev-support/hbase-personality.sh | 6 +----- dev-support/hbase_nightly_yetus.sh | 2 -- dev-support/jenkins_precommit_github_yetus.sh | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 98d73f562da..d149436d621 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -81,11 +81,8 @@ 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=12500 + PROC_LIMIT=12500 # Set docker container to run with 20g. Default is 4g in yetus. # See HBASE-19902 for how we arrived at 20g. @@ -519,7 +516,6 @@ function hadoopcheck_parse_args ## @stability evolving function hadoopcheck_docker_support { - DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "--ulimit" "nproc=12500") DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "--env=QUICK_HADOOPCHECK=${QUICK_HADOOPCHECK}") } diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh index 32724ba8da7..ef91f207284 100755 --- a/dev-support/hbase_nightly_yetus.sh +++ b/dev-support/hbase_nightly_yetus.sh @@ -65,8 +65,6 @@ YETUS_ARGS=("--sentinel" "${YETUS_ARGS[@]}") 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=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 a1d57204b75..bc7221b5881 100755 --- a/dev-support/jenkins_precommit_github_yetus.sh +++ b/dev-support/jenkins_precommit_github_yetus.sh @@ -102,7 +102,6 @@ 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=12500") YETUS_ARGS+=("--dockermemlimit=20g") # -1 spotbugs issues that show up prior to the patch being applied YETUS_ARGS+=("--spotbugs-strict-precheck")