SERVER-51467 Set waitUntilStable to true when upgrading clusters in change_streams_multiversion_cluster.js

(cherry picked from commit 517e447020)

buildscripts/generate_compile_expansions.py

@@ -60,8 +60,8 @@ def generate_version_expansions():
             raise ValueError("Unable to parse version from stdin and no version.json provided")
 
     if version_parts[0]:
-        expansions["suffix"] = "latest"
-        expansions["src_suffix"] = "latest"
+        expansions["suffix"] = "v4.8-latest"
+        expansions["src_suffix"] = "v4.8-latest"
         expansions["is_release"] = "false"
     else:
         expansions["suffix"] = version_line

buildscripts/generate_compile_expansions_shared_cache.py

@@ -60,8 +60,8 @@ def generate_version_expansions():
             raise ValueError("Unable to parse version from stdin and no version.json provided")
 
     if version_parts[0]:
-        expansions["suffix"] = "latest"
-        expansions["src_suffix"] = "latest"
+        expansions["suffix"] = "v4.8-latest"
+        expansions["src_suffix"] = "v4.8-latest"
         expansions["is_release"] = "false"
     else:
         expansions["suffix"] = version_line

etc/evergreen.yml

@@ -376,7 +376,6 @@ variables:
   - enterprise-windows-inmem
   - enterprise-windows-nopush-template
   - enterprise-windows-required
-  - enterprise-windows-wtdevelop
   - ubuntu1804-debug-asan
   - ubuntu1804-debug-ubsan
   - ubuntu1804-debug-aubsan-lite
@@ -506,7 +505,6 @@ functions:
       directory: ${git_project_directory|src}
       revisions: # for each module include revision as <module_name> : ${<module_name>_rev}
         enterprise: ${enterprise_rev}
-        wtdevelop: ${wtdevelop_rev}
 
   "fetch artifacts": &fetch_artifacts
     command: s3.get
@@ -635,7 +633,7 @@ functions:
   "get buildnumber": &get_buildnumber
     command: keyval.inc
     params:
-      key: "${build_variant}_master"
+      key: "${build_variant}_v4.8"
       destination: "builder_num"
 
   "run diskstats": &run_diskstats
@@ -8537,12 +8535,7 @@ modules:
 - name: enterprise
   repo: git@github.com:10gen/mongo-enterprise-modules.git
   prefix: src/mongo/db/modules
-  branch: master
-
-- name: wtdevelop
-  repo: git@github.com:wiredtiger/wiredtiger.git
-  prefix: src/third_party
-  branch: develop
+  branch: v4.8
 
 #######################################
 #            Buildvariants            #
@@ -8638,18 +8631,6 @@ buildvariants:
   - name: server_discovery_and_monitoring_json_test_TG
   - name: server_selection_json_test_TG
 
-- <<: *linux-64-debug-template
-  name: linux-64-debug-wtdevelop
-  display_name: "~ Linux DEBUG WiredTiger develop"
-  batchtime: 240 # 4 hours
-  modules:
-  - wtdevelop
-  expansions:
-    use_wt_develop: true
-    resmoke_jobs_factor: 0.5  # Avoid starting too many mongod's
-    compile_flags: --dbg=on --opt=on -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --enable-free-mon=off --enable-http-client=off
-    test_flags: --excludeWithAnyTags=requires_http_client
-
 - name: linux-64-duroff
   display_name: Linux (No Journal)
   run_on:
@@ -8793,7 +8774,6 @@ buildvariants:
   display_name: TLA+
   run_on:
   - ubuntu1804-build
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     timeout_secs: 345600 # 4 days
@@ -9063,7 +9043,6 @@ buildvariants:
   - enterprise
   run_on:
   - ubuntu1804-zseries-test
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -9724,17 +9703,6 @@ buildvariants:
     - windows-64-vs2019-large
   - name: .benchmarks
 
-- <<: *enterprise-windows-nopush-template
-  name: enterprise-windows-wtdevelop
-  display_name: "~ Enterprise Windows WiredTiger develop"
-  batchtime: 240 # 4 hours
-  modules:
-  - enterprise
-  - wtdevelop
-  expansions:
-    <<: *enterprise-windows-nopush-expansions-template
-    use_wt_develop: true
-
 - name: enterprise-windows-inmem
   display_name: Enterprise Windows (inMemory)
   modules:
@@ -9984,7 +9952,6 @@ buildvariants:
   display_name: "Embedded SDK - macOS"
   run_on:
   - macos-1014
-  batchtime: 10080 # 7 days
   expansions:
     test_flags: --excludeWithAnyTags=uses_transactions
     cmake_path: /Applications/cmake-3.11.0-Darwin-x86_64/CMake.app/Contents/bin/cmake
@@ -10034,7 +10001,6 @@ buildvariants:
 
 - name: enterprise-rhel-62-64-bit
   display_name: "Enterprise RHEL 6.2"
-  batchtime: 1440 # 1 day
   modules:
   - enterprise
   run_on:
@@ -10257,7 +10223,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel62-small
-  batchtime: 10080 # 7 days
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
     compile_flags: >-
@@ -10462,6 +10427,7 @@ buildvariants:
 # currently only run on our daily builders.
 - name: enterprise-rhel-62-64-bit-multiversion
   display_name: "Enterprise RHEL 6.2 (implicit multiversion)"
+  batchtime: 1440 # 1 day
   modules:
   - enterprise
   run_on:
@@ -10496,7 +10462,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel62-small
-  batchtime: 10080 # 7 days
   expansions: &enterprise-rhel-62-64-bit-flow-control-off
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
     test_flags: >-
@@ -10603,7 +10568,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel62-small
-  batchtime: 10080 # 7 days
   expansions:
     test_flags: >-
       --mongodSetParameters="{measureOperationResourceConsumption: true}"
@@ -10638,7 +10602,6 @@ buildvariants:
     - enterprise
   run_on:
     - rhel62-large
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -10699,7 +10662,6 @@ buildvariants:
 # are spending when we split tasks into multiple sub-tasks.
 - name: enterprise-rhel-62-64-bit-single-task-baseline
   display_name: "Enterprise RHEL 6.2 (Single Task Baseline)"
-  batchtime: 10080  # 1 week.
   modules:
     - enterprise
   run_on:
@@ -10928,7 +10890,6 @@ buildvariants:
 - <<: *enterprise-rhel-70-64-bit-template
   name: enterprise-rhel-70-64-bit-kitchen-sink
   display_name: "~ Enterprise RHEL 7.0 (Dagger)"
-  batchtime: 1440 # 1 day
   expansions:
     <<: *enterprise-rhel-70-64-bit-expansions-template
     compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
@@ -10942,7 +10903,6 @@ buildvariants:
 - <<: *enterprise-rhel-70-64-bit-template
   name: hot_backups-rhel-70-64-bit
   display_name: "hot_backups RHEL 7.0"
-  batchtime: 1440  # 1 day
   run_on:
   - rhel70
   expansions:
@@ -10958,7 +10918,6 @@ buildvariants:
 - <<: *enterprise-rhel-70-64-bit-template
   name: enterprise-rhel-70-64-bit-no-libunwind
   display_name: "~ Enterprise RHEL 7.0 (no-libunwind)"
-  batchtime: 10080  # 1 week
   run_on:
   - rhel70
   expansions:
@@ -11360,7 +11319,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel72-zseries-test
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -11442,7 +11400,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel67-zseries-test
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -11690,7 +11647,6 @@ buildvariants:
   - enterprise
   run_on:
   - suse12-zseries-test
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -12258,7 +12214,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel71-power8-test
-  batchtime: 10080 # 7 days
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -12571,7 +12526,6 @@ buildvariants:
 
 - name: enterprise-ubuntu-no-latch-1604-64-bit
   display_name: "~ Enterprise Ubuntu 16.04 (without Diagnostic Latches)"
-  batchtime: 1440 # 1 day
   modules:
   - enterprise
   expansions:
@@ -12583,7 +12537,6 @@ buildvariants:
 
 - name: enterprise-ubuntu-no-latch-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 DEBUG (Unoptimized)"
-  batchtime: 1440 # 1 day
   modules:
   - enterprise
   expansions:
@@ -12596,7 +12549,6 @@ buildvariants:
 
 - name: enterprise-ubuntu-scanning-replica-set-monitor-1604-64-bit
   display_name: "~ Enterprise Ubuntu 16.04 (with ScanningReplicaSetMonitor)"
-  batchtime: 1440 # 1 day
   run_on:
     - ubuntu1604-test
   modules:
@@ -12627,7 +12579,6 @@ buildvariants:
 
 - name: enterprise-ubuntu-sdam-replica-set-monitor-1604-64-bit
   display_name: "~ Enterprise Ubuntu 16.04 (with SdamReplicaSetMonitor)"
-  batchtime: 1440 # 1 day
   run_on:
     - ubuntu1604-test
   modules:
@@ -12658,7 +12609,6 @@ buildvariants:
 
 - name: enterprise-ubuntu-task-executor-pool-size-1604-64-bit
   display_name: "~ Enterprise Ubuntu 16.04 (with {taskExecutorPoolSize: 4})"
-  batchtime: 1440 # 1 day
   run_on:
     - ubuntu1604-test
   modules:

etc/perf.yml

@@ -31,7 +31,6 @@ variables:
   _modules: &modules
     - enterprise
     - mongo-tools
-    - wtdevelop
 
     - dsi
     - signal-processing
@@ -46,7 +45,7 @@ modules:
 - name: enterprise
   repo: git@github.com:10gen/mongo-enterprise-modules.git
   prefix: src/mongo/db/modules
-  branch: master
+  branch: v4.8
 - name: mongo-tools
   repo: git@github.com:mongodb/mongo-tools.git
   prefix: mongo-tools/src/github.com/mongodb
@@ -74,10 +73,6 @@ modules:
   repo: git@github.com:10gen/workloads.git
   prefix: workloads
   branch: master
-- name: wtdevelop
-  repo: git@github.com:wiredtiger/wiredtiger.git
-  prefix: src/third_party
-  branch: develop
 - name: linkbench
   repo: git@github.com:10gen/linkbench.git
   prefix: linkbench
@@ -672,7 +667,6 @@ tasks:
         directory: src
         revisions:
           enterprise: ${enterprise_rev}
-          wtdevelop: ${wtdevelop_rev}
           mongo-tools: ${mongo-tools_rev}
     - command: shell.exec
       params:

etc/system_perf.yml

@@ -75,10 +75,6 @@ modules:
   repo: git@github.com:10gen/workloads.git
   prefix: workloads
   branch: master
-- name: wtdevelop
-  repo: git@github.com:wiredtiger/wiredtiger.git
-  prefix: src/third_party
-  branch: develop
 - name: linkbench
   repo: git@github.com:10gen/linkbench.git
   prefix: linkbench
@@ -97,7 +93,7 @@ modules:
 - name: enterprise
   repo: git@github.com:10gen/mongo-enterprise-modules.git
   prefix: src/mongo/db/modules
-  branch: master
+  branch: v4.8
 - name: mongo-tools
   repo: git@github.com:mongodb/mongo-tools.git
   prefix: mongo-tools/src/github.com/mongodb
@@ -476,7 +472,6 @@ tasks:
         directory: src
         revisions:
           enterprise: ${enterprise_rev}
-          wtdevelop: ${wtdevelop_rev}
           mongo-tools: ${mongo-tools_rev}
     - command: shell.exec
       params:
@@ -922,16 +917,6 @@ buildvariants:
     - name: bestbuy_query
 
 
-- <<: *compile-amazon2
-  name: wtdevelop-compile-amazon2
-  display_name: WT Develop Compile
-  modules: *modules
-  expansions:
-    <<: *compile-expansions
-    compile-variant: -wtdevelop
-  tasks:
-    - name: compile
-
 - name: compile-rhel70
   display_name: Compile for Atlas-like
   modules: *modules
@@ -1506,54 +1491,3 @@ buildvariants:
     - name: linkbench
     - name: genny_patch_tasks
     - name: genny_auto_tasks
-
-- name: wtdevelop-1-node-replSet
-  display_name: WT Develop 1-Node ReplSet
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: single-replica
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    compile-variant: -wtdevelop
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
-      - "rhel70-perf-single"
-  depends_on: *_compile_wtdevelop_amazon2
-  tasks: *1nodetasks
-
-- name: wtdevelop-standalone
-  display_name: WT Develop Standalone
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: standalone
-    infrastructure_provisioning: single
-    platform: linux
-    project_dir: *project_dir
-    compile-variant: -wtdevelop
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
-      - "rhel70-perf-single"
-  depends_on: *_compile_wtdevelop_amazon2
-  tasks: *standalonetasks
-
-- name: wtdevelop-3-node-replSet
-  display_name: WT Develop 3-Node ReplSet
-  batchtime: 10080 # 7 days
-  modules: *modules
-  expansions:
-    mongodb_setup: replica
-    infrastructure_provisioning: replica
-    platform: linux
-    project_dir: *project_dir
-    compile-variant: -wtdevelop
-    authentication: enabled
-    storageEngine: wiredTiger
-  run_on:
-      - "rhel70-perf-replset"
-  depends_on: *_compile_wtdevelop_amazon2
-  tasks: *3nodetasks

jstests/multiVersion/genericChangeStreams/change_streams_multi_version_cluster.js

@@ -84,7 +84,9 @@ function runTest(downgradeVersion) {
     //
     // Upgrade the config db and the shards to the "latest" binVersion.
     //
-    st.upgradeCluster("latest", {upgradeShards: true, upgradeConfigs: true, upgradeMongos: false});
+    st.upgradeCluster(
+        "latest",
+        {upgradeShards: true, upgradeConfigs: true, upgradeMongos: false, waitUntilStable: true});
 
     //
     // Open and read a change stream on the upgraded cluster but still using a downgraded version of
@@ -96,7 +98,9 @@ function runTest(downgradeVersion) {
     // Upgrade mongos to the "latest" binVersion and then open and read a change stream, this time
     // with all cluster nodes upgraded but still in downgraded FCV.
     //
-    st.upgradeCluster("latest", {upgradeShards: false, upgradeConfigs: false, upgradeMongos: true});
+    st.upgradeCluster(
+        "latest",
+        {upgradeShards: false, upgradeConfigs: false, upgradeMongos: true, waitUntilStable: true});
     mongosConn = st.s;
     coll = mongosConn.getDB(dbName)[collName];
 

src/mongo/installer/msi/SConscript

@@ -62,15 +62,15 @@ msi_platform = 'x64'
 # Enterprise
 if 'enterprise' in env['MONGO_MODULES']:
   msi_edition = 'Enterprise'
-  upgrade_code = 'a345b849-e311-4be7-afd8-3f29ee404882'
+  upgrade_code = '90222619-e6df-4d7b-a34a-ebead95e016d'
 # Community
 else:
   if get_option('ssl') == 'on':
     msi_edition = 'SSL'
-    upgrade_code = '06ac54f6-a00b-41b1-a3f2-6327ceba0882'
+    upgrade_code = 'ccf88af5-51a8-430a-81bd-0ad410c1665d'
   else:
     msi_edition = 'Standard'
-    upgrade_code = '38b73dec-0435-470b-9dfd-d52e724f17ec'
+    upgrade_code = 'e8440665-7088-446a-adf1-e6fecd2e2c3e'
 
 sourcesList.append("Installer_64.wxs")
 
@@ -94,7 +94,7 @@ major_version = "%s.%s" % (mv[0], mv[1])
 #    It allows upgrade from 3.2.0 to 3.2.1 in place instead of side-by-side.
 # 3. Update the check for the next major release below so we bump the GUIDs in the future.
 #
-if float(major_version) > 4.8:
+if float(major_version) > 4.9:
     # If you are troubleshooting this error, see the comment above
     env.FatalError("The upgrade codes are out of date for this release. Please \n" +
     "replace the existing GUIDs listed in this file with new GUIDs so " +