Skip to content

Commit 0931019

Browse files
committed
Revert "HBASE-24126 Up the container nproc uplimit from 10000 to 12500 (#1450)"
This reverts commit f5b3945.
1 parent f6ab525 commit 0931019

5 files changed

Lines changed: 5 additions & 8 deletions

File tree

dev-support/flaky-tests/flaky-reporting.Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pipeline {
4343
flaky_args=("${flaky_args[@]}" --urls "${JENKINS_URL}/job/HBase%20Nightly/job/${BRANCH_NAME}" --is-yetus True --max-builds 10)
4444
flaky_args=("${flaky_args[@]}" --urls "${JENKINS_URL}/job/HBase-Flaky-Tests/job/${BRANCH_NAME}" --is-yetus False --max-builds 30)
4545
docker build -t hbase-dev-support dev-support
46-
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[@]}"
46+
docker run -v "${WORKSPACE}":/hbase --workdir=/hbase hbase-dev-support python dev-support/flaky-tests/report-flakies.py --mvn -v "${flaky_args[@]}"
4747
'''
4848
}
4949
}

dev-support/hbase-personality.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,8 @@ function personality_globals
8181

8282
# Yetus 0.7.0 enforces limits. Default proclimit is 1000.
8383
# Up it. See HBASE-19902 for how we arrived at this number.
84-
# NOTE: I don't think changing this has an effect. Set the
85-
# --proclimit passed to yetus. This seems to do what we
86-
# need changing proclimit.
8784
#shellcheck disable=SC2034
88-
PROCLIMIT=12500
85+
PROCLIMIT=10000
8986

9087
# Set docker container to run with 20g. Default is 4g in yetus.
9188
# See HBASE-19902 for how we arrived at 20g.

dev-support/hbase_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,4 @@ done
159159
echo "Successfully built ${IMAGE_NAME}."
160160

161161
echo "Starting hbase shell..."
162-
docker run --ulimit nproc=12500 -it ${IMAGE_NAME}
162+
docker run -it ${IMAGE_NAME}

dev-support/hbase_nightly_yetus.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ YETUS_ARGS=("--branch=${BRANCH_NAME}" "${YETUS_ARGS[@]}")
6666
YETUS_ARGS=("--tests-filter=${TESTS_FILTER}" "${YETUS_ARGS[@]}")
6767
YETUS_ARGS=("--ignore-unknown-options=true" "${YETUS_ARGS[@]}")
6868
# Why are these not being picked up from hbase-personality?
69-
YETUS_ARGS=("--proclimit=12500" "${YETUS_ARGS[@]}")
69+
YETUS_ARGS=("--proclimit=10000" "${YETUS_ARGS[@]}")
7070
YETUS_ARGS=("--dockermemlimit=20g" "${YETUS_ARGS[@]}")
7171

7272
if [[ -n "${EXCLUDE_TESTS_URL}" ]]; then

dev-support/jenkins_precommit_github_yetus.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ YETUS_ARGS+=("--reapermode=kill")
102102
# set relatively high limits for ASF machines
103103
# changing these to higher values may cause problems
104104
# with other jobs on systemd-enabled machines
105-
YETUS_ARGS+=("--proclimit=12500")
105+
YETUS_ARGS+=("--proclimit=10000")
106106
YETUS_ARGS+=("--dockermemlimit=20g")
107107
# -1 spotbugs issues that show up prior to the patch being applied
108108
YETUS_ARGS+=("--spotbugs-strict-precheck")

0 commit comments

Comments
 (0)