[hbase] branch branch-2 updated: HBASE-24126 Up the container nproc uplimit from 10000 to 12500 Addendum number 2; docker doesn't like the ulimit arg as is.

[stack]

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

stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 01715fb  HBASE-24126 Up the container nproc uplimit from 10000 to 
12500 Addendum number 2; docker doesn't like the ulimit arg as is.
01715fb is described below

commit 01715fbbf6e00edbb4497bfa72e3c2a5b9937088
Author: stack <st...@apache.org>
AuthorDate: Mon Apr 6 18:23:35 2020 -0700

    HBASE-24126 Up the container nproc uplimit from 10000 to 12500
    Addendum number 2; docker doesn't like the ulimit arg as is.
---
 dev-support/flaky-tests/flaky-reporting.Jenkinsfile | 2 +-
 dev-support/hbase-personality.sh                    | 3 ++-
 dev-support/hbase_docker.sh                         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-support/flaky-tests/flaky-reporting.Jenkinsfile 
b/dev-support/flaky-tests/flaky-reporting.Jenkinsfile
index 7506d06..58e7328 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:12500 -v "${WORKSPACE}":/hbase 
--workdir=/hbase hbase-dev-support python 
dev-support/flaky-tests/report-flakies.py --mvn -v "${flaky_args[@]}"
+          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[@]}"
 '''
       }
     }
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 35c5cd0..58d2aa8 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -513,7 +513,8 @@ function hadoopcheck_parse_args
 ## @stability    evolving
 function hadoopcheck_docker_support
 {
-  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" 
"--env=QUICK_HADOOPCHECK=${QUICK_HADOOPCHECK}" "--ulimit nproc=12500:12500")
+  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" "--ulimit" "nproc=12500")
+  DOCKER_EXTRAARGS=("${DOCKER_EXTRAARGS[@]}" 
"--env=QUICK_HADOOPCHECK=${QUICK_HADOOPCHECK}")
 }
 
 ## @description  hadoopcheck test
diff --git a/dev-support/hbase_docker.sh b/dev-support/hbase_docker.sh
index bd8de2a..59a15f7 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:12500 -it ${IMAGE_NAME}
+docker run --ulimit nproc=12500 -it ${IMAGE_NAME}