From aa729eac79f4a193933f8ab273fb2053c5c44004 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Fri, 21 Jan 2022 16:03:06 +1100 Subject: Import wiredtiger: f7869fbf082261c45cc1d690f25bf3bf5b585aa3 from branch mongodb-master ref: 0e8c23047f..f7869fbf08 for: 5.3.0 WT-8382 Halve the number of concurrent jobs when running PPC & zSeries tests --- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/test/evergreen.yml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/third_party') diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index ea14c0b304d..e8403d8e4cd 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "0e8c23047f6b1ce08cf73f9e179270f39e1b59e8" + "commit": "f7869fbf082261c45cc1d690f25bf3bf5b585aa3" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index d9b264eaf68..fd926f2f758 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -4068,7 +4068,8 @@ buildvariants: -DENABLE_STRICT=1 -DCMAKE_INSTALL_PREFIX=$(pwd)/LOCAL_INSTALL python_binary: '/opt/mongodbtoolchain/v3/bin/python3' - smp_command: -j $(grep -c ^processor /proc/cpuinfo) + # Use half number of vCPU to avoid OOM kill failure + smp_command: -j $(echo $(grep -c ^processor /proc/cpuinfo) / 2 | bc) cmake_generator: Ninja make_command: ninja tasks: @@ -4098,7 +4099,8 @@ buildvariants: -DENABLE_STRICT=1 -DCMAKE_INSTALL_PREFIX=$(pwd)/LOCAL_INSTALL python_binary: '/opt/mongodbtoolchain/v3/bin/python3' - smp_command: -j $(grep -c ^processor /proc/cpuinfo) + # Use half number of vCPU to avoid OOM kill failure + smp_command: -j $(echo $(grep -c ^processor /proc/cpuinfo) / 2 | bc) cmake_generator: Ninja make_command: ninja tasks: -- cgit v1.2.1