From 32eb49a0c2c26315aed8bb47befba915cd071f55 Mon Sep 17 00:00:00 2001 From: Nick Vatamaniuc Date: Thu, 22 Jun 2017 21:04:51 -0400 Subject: Update --- .travis.yml | 2 ++ Jenkinsfile | 10 ++++++++++ Makefile | 15 +++++++++++++++ build-aux/logfile-uploader.py | 3 +++ dev/run | 4 ++-- 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1f54a79b..a50a36cd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,8 @@ before_script: - ./configure -c --disable-docs --disable-fauxton script: + - ulimit -c unlimited + - cat /proc/sys/kernel/core_pattern - make check after_failure: diff --git a/Jenkinsfile b/Jenkinsfile index 411177d85..a02063c80 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,6 +65,7 @@ pipeline { sh 'docker pull couchdbdev/centos-6-erlang-18.3' withDockerContainer(image: 'couchdbdev/centos-6-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -89,6 +90,7 @@ pipeline { sh 'docker pull couchdbdev/centos-7-erlang-default' withDockerContainer(image: 'couchdbdev/centos-7-erlang-default', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -113,6 +115,7 @@ pipeline { sh 'docker pull couchdbdev/centos-7-erlang-18.3' withDockerContainer(image: 'couchdbdev/centos-7-erlang-18.3', args: '-e LD_LIBRARY_PATH=/usr/local/bin --user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -137,6 +140,7 @@ pipeline { sh 'docker pull couchdbdev/ubuntu-12.04-erlang-18.3' withDockerContainer(image: 'couchdbdev/ubuntu-12.04-erlang-18.3', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -161,6 +165,7 @@ pipeline { sh 'docker pull couchdbdev/ubuntu-14.04-erlang-default' withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-default', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -185,6 +190,7 @@ pipeline { sh 'docker pull couchdbdev/ubuntu-14.04-erlang-18.3' withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-18.3', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -209,6 +215,7 @@ pipeline { sh 'docker pull couchdbdev/ubuntu-16.04-erlang-default' withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-default', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -233,6 +240,7 @@ pipeline { sh 'docker pull couchdbdev/ubuntu-16.04-erlang-18.3' withDockerContainer(image: 'couchdbdev/ubuntu-16.04-erlang-18.3', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -257,6 +265,7 @@ pipeline { sh 'docker pull couchdbdev/debian-8-erlang-default' withDockerContainer(image: 'couchdbdev/debian-8-erlang-default', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs @@ -281,6 +290,7 @@ pipeline { sh 'docker pull couchdbdev/debian-8-erlang-18.3' withDockerContainer(image: 'couchdbdev/debian-8-erlang-18.3', args: '--user 0:0') { sh ''' + ulimit -c unlimited echo "***** COUCHDB_IO_LOG_DIR: ${COUCHDB_IO_LOG_DIR}" cwd=$(pwd) rm -rf /tmp/couchjslogs diff --git a/Makefile b/Makefile index f6084c42c..97b81fac3 100644 --- a/Makefile +++ b/Makefile @@ -89,6 +89,18 @@ fauxton: share/www .PHONY: check # target: check - Test everything check: all + @echo "********* environment info ******** " + @cat /proc/meminfo + @free -m + @sh -c 'ulimit -a' + @grep -r '.*' /sys/fs/cgroup/memory/ || true + @tail -n 20 /proc/cpuinfo || true + @echo "******** environment info end ***** " + @echo "******** core file pattern:" + @ls -l /proc/sys/kernel/core_pattern || true + @cat /proc/sys/kernel/core_pattern || true + @cat /usr/share/apport/apport || true + @echo "************" @$(MAKE) eunit @$(MAKE) javascript # @$(MAKE) build-test @@ -116,6 +128,9 @@ endif @rm -rf dev/lib @dev/run -n 1 -q --with-admin-party-please \ -c 'startup_jitter=0' \ + -c 'os_process_limit=12' \ + -c 'os_process_soft_limit=4' \ + -c 'os_process_timeout=30000' \ test/javascript/run $(suites) diff --git a/build-aux/logfile-uploader.py b/build-aux/logfile-uploader.py index 8de2b2a85..12bae27e4 100755 --- a/build-aux/logfile-uploader.py +++ b/build-aux/logfile-uploader.py @@ -45,6 +45,9 @@ def collect_logfiles(): for log in glob.glob('/tmp/couchjslogs/*'): print ("Uploading OS process IO log", log) tb.add(log) + for core in glob.glob('core*'): + print ("Uploading core file", core) + tb.add(core) tb.close() def build_ci_doc(): diff --git a/dev/run b/dev/run index 8af3ac416..a7a494a6e 100755 --- a/dev/run +++ b/dev/run @@ -265,10 +265,10 @@ def hack_default_ini(ctx, node, contents): mainjs = os.path.join(ctx['rootdir'], "share", "server", "main.js") coffeejs = os.path.join(ctx['rootdir'], "share", "server", "main-coffee.js") - repl = toposixpath("javascript = %s %s" % (couchjs, mainjs)) + repl = toposixpath("javascript = %s -S 4000000 %s" % (couchjs, mainjs)) contents = re.sub("(?m)^javascript.*$", repl, contents) - repl = toposixpath("coffeescript = %s %s" % (couchjs, coffeejs)) + repl = toposixpath("coffeescript = %s -S 4000000 %s" % (couchjs, coffeejs)) contents = re.sub("(?m)^coffeescript.*$", repl, contents) return contents -- cgit v1.2.1