SERVER-39007 Use rhel62-large distro for InMemory's concurrency* tasks.

  * Changes resmoke.py to propagate --storageEngineCacheSizeGB as
    --inMemorySizeGB when running with the InMemory storage engine.

  * Changes the mongo shell to propagate
    TestData.storageEngineCacheSizeGB as --inMemorySizeGB when running
    with the InMemory storage engine.

  * Sets --storageEngineCacheSizeGB=4 when running with the InMemory
    storage engine in Evergreen.

1 files changed, 31 insertions, 6 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index c5b2461f7a0..a26137de341 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -1191,12 +1191,21 @@ functions:
           extra_args="$extra_args --continueOnFailure"
         fi
 
-        # Default storageEngineCacheSizeGB to 1. Override on individual test config if needed.
-        # resmoke will assign to the appropriate parameter on storage engines that support it.
+        # We reduce the storage engine's cache size to reduce the likelihood of a mongod process
+        # being killed by the OOM killer. The --storageEngineCacheSizeGB command line option is only
+        # filled in with a default value here if one hasn't already been specified in the task's
+        # definition or build variant's definition.
         set +o errexit
-        echo "${resmoke_args}" | grep -q storageEngineCacheSizeGB
+        echo "${resmoke_args} ${test_flags}" | grep -q storageEngineCacheSizeGB
         if [ $? -eq 1 ]; then
-          extra_args="$extra_args --storageEngineCacheSizeGB=1"
+          echo "${resmoke_args} ${test_flags}" | grep -q "\-\-storageEngine=inMemory"
+          if [ $? -eq 0 ]; then
+            # We use a default of 4GB for the InMemory storage engine.
+            extra_args="$extra_args --storageEngineCacheSizeGB=4"
+          else
+            # We use a default of 1GB for all other storage engines.
+            extra_args="$extra_args --storageEngineCacheSizeGB=1"
+          fi
         fi
         set -o errexit
 
@@ -13073,19 +13082,35 @@ buildvariants:
     distros:
     - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_replication
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_replication_causal_consistency
     distros:
-    - rhel62-large
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_sharded_replication
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_sharded_replication_with_balancer
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_sharded_causal_consistency
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_sharded_causal_consistency_and_balancer
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_sharded_with_stepdowns
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_sharded_with_stepdowns_and_balancer
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_simultaneous
+    distros:
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: concurrency_simultaneous_replication
     distros:
-    - rhel62-large
+    - rhel62-large  # Some workloads require a lot of memory, use a bigger machine for this suite.
   - name: failpoints
   - name: failpoints_auth
   - name: gle_auth