This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push:
new 5e17c9b Reduce CCM heap settings to match those in circleci, and
limit docker containers to 15g memory (and disable swapping) (INFRA-20107)
5e17c9b is described below
commit 5e17c9b5258d4edcffd2ff640aac94bb9ba27cf2
Author: Mick Semb Wever <[email protected]>
AuthorDate: Tue Oct 13 09:51:27 2020 +0200
Reduce CCM heap settings to match those in circleci, and limit docker
containers to 15g memory (and disable swapping) (INFRA-20107)
---
build-scripts/cassandra-dtest-pytest.sh | 4 ++--
docker/jenkins/jenkinscommand.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build-scripts/cassandra-dtest-pytest.sh
b/build-scripts/cassandra-dtest-pytest.sh
index f78f4dc..c26db50 100755
--- a/build-scripts/cassandra-dtest-pytest.sh
+++ b/build-scripts/cassandra-dtest-pytest.sh
@@ -15,8 +15,8 @@ export PYTHONIOENCODING="utf-8"
export PYTHONUNBUFFERED=true
export CASS_DRIVER_NO_EXTENSIONS=true
export CASS_DRIVER_NO_CYTHON=true
-export CCM_MAX_HEAP_SIZE="2048M"
-export CCM_HEAP_NEWSIZE="200M"
+export CCM_MAX_HEAP_SIZE="1024M"
+export CCM_HEAP_NEWSIZE="512M"
export CCM_CONFIG_DIR=${WORKSPACE}/.ccm
export NUM_TOKENS="32"
export CASSANDRA_DIR=${WORKSPACE}
diff --git a/docker/jenkins/jenkinscommand.sh b/docker/jenkins/jenkinscommand.sh
index 1c7f9e1..88d3d24 100644
--- a/docker/jenkins/jenkinscommand.sh
+++ b/docker/jenkins/jenkinscommand.sh
@@ -16,7 +16,7 @@ DTEST_BRANCH=$4
EOF
echo "jenkinscommand.sh: running: git clone --single-branch --depth 1 --branch
$BUILDSBRANCH $BUILDSREPO; sh ./cassandra-builds/docker/jenkins/dtest.sh
$TARGET $SPLIT_CHUNK"
-ID=$(docker run --env-file env.list -dt $DOCKER_IMAGE dumb-init bash -ilc "git
clone --single-branch --depth 1 --branch $BUILDSBRANCH $BUILDSREPO; sh
./cassandra-builds/docker/jenkins/dtest.sh $TARGET $SPLIT_CHUNK")
+ID=$(docker run -m 15g --memory-swap 15g --env-file env.list -dt $DOCKER_IMAGE
dumb-init bash -ilc "git clone --single-branch --depth 1 --branch $BUILDSBRANCH
$BUILDSREPO; sh ./cassandra-builds/docker/jenkins/dtest.sh $TARGET
$SPLIT_CHUNK")
# use docker attach instead of docker wait to get output
docker attach --no-stdin $ID
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
