diff --git a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile index 58e7328f7b4..37d557c82d6 100644 --- a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile +++ b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile @@ -43,7 +43,7 @@ pipeline { flaky_args=("${flaky_args[@]}" --urls "${JENKINS_URL}/job/HBase%20Nightly/job/${BRANCH_NAME}" --is-yetus True --max-builds 10) flaky_args=("${flaky_args[@]}" --urls "${JENKINS_URL}/job/HBase-Flaky-Tests/job/${BRANCH_NAME}" --is-yetus False --max-builds 30) docker build -t hbase-dev-support dev-support - docker run --ulimit nproc=12500 -v "${WORKSPACE}":/hbase --workdir=/hbase hbase-dev-support python dev-support/flaky-tests/report-flakies.py --mvn -v "${flaky_args[@]}" + docker run -v "${WORKSPACE}":/hbase --workdir=/hbase hbase-dev-support python dev-support/flaky-tests/report-flakies.py --mvn -v "${flaky_args[@]}" ''' } } diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 68bfda32ace..ec051873b0e 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 + PROCLIMIT=10000 # 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_docker.sh b/dev-support/hbase_docker.sh index 59a15f7d917..cc17cf7af01 100755 --- a/dev-support/hbase_docker.sh +++ b/dev-support/hbase_docker.sh @@ -159,4 +159,4 @@ done echo "Successfully built ${IMAGE_NAME}." echo "Starting hbase shell..." -docker run --ulimit nproc=12500 -it ${IMAGE_NAME} +docker run -it ${IMAGE_NAME} diff --git a/dev-support/hbase_nightly_yetus.sh b/dev-support/hbase_nightly_yetus.sh index 32724ba8da7..11a44e0ff32 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=12500" "${YETUS_ARGS[@]}") +YETUS_ARGS=("--proclimit=10000" "${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..e0ead27f0ab 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=12500") +YETUS_ARGS+=("--proclimit=10000") YETUS_ARGS+=("--dockermemlimit=20g") # -1 spotbugs issues that show up prior to the patch being applied YETUS_ARGS+=("--spotbugs-strict-precheck")