RUST-1821 EOL support for 3.6 (#1151)

abr-egn · web-flow · commit 7976de7eaf90 · 2024-06-26T16:16:04.000-04:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -87,9 +87,9 @@ buildvariants:
       SSL: ssl
     tasks:
       # Ubuntu 22.04 does not support MongoDB versions below 6.0.
-      - name: .standalone !.3.6 !.4.0 !.4.2 !.4.4 !.5.0
-      - name: .replicaset !.3.6 !.4.0 !.4.2 !.4.4 !.5.0
-      - name: .sharded !.3.6 !.4.0 !.4.2 !.4.4 !.5.0
+      - name: .standalone !.4.0 !.4.2 !.4.4 !.5.0
+      - name: .replicaset !.4.0 !.4.2 !.4.4 !.5.0
+      - name: .sharded !.4.0 !.4.2 !.4.4 !.5.0
 
   - name: macos-11.00
     display_name: "MacOS 11.00"
@@ -193,7 +193,7 @@ buildvariants:
     tasks:
       # The Stable API was introduced in MongoDB version 5.0. Drivers Evergreen Tools only supports
       # setting REQUIRE_API_VERSION on standalones.
-      - .standalone !.3.6 !.4.0 !.4.2 !.4.4
+      - .standalone !.4.0 !.4.2 !.4.4
 
   - name: sync-api
     display_name: "Sync API"
diff --git a/.evergreen/generate-tasks/src/main.rs b/.evergreen/generate-tasks/src/main.rs
@@ -1,5 +1,5 @@
 static VERSIONS: &[&str] = &[
-    "3.6", "4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest",
+    "4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest",
 ];
 
 static TOPOLOGIES: &[(&str, &str)] = &[
diff --git a/.evergreen/suite-tasks.yml b/.evergreen/suite-tasks.yml
@@ -3,15 +3,6 @@
 
 tasks:
 
-  - name: test-3.6-standalone
-    tags: [3.6, standalone]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          MONGODB_VERSION: 3.6
-          TOPOLOGY: server
-      - func: "run driver test suite"
-
   - name: test-4.0-standalone
     tags: [4.0, standalone]
     commands:
@@ -93,15 +84,6 @@ tasks:
           TOPOLOGY: server
       - func: "run driver test suite"
 
-  - name: test-3.6-replicaset
-    tags: [3.6, replicaset]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          MONGODB_VERSION: 3.6
-          TOPOLOGY: replica_set
-      - func: "run driver test suite"
-
   - name: test-4.0-replicaset
     tags: [4.0, replicaset]
     commands:
@@ -183,15 +165,6 @@ tasks:
           TOPOLOGY: replica_set
       - func: "run driver test suite"
 
-  - name: test-3.6-sharded
-    tags: [3.6, sharded]
-    commands:
-      - func: "bootstrap mongo-orchestration"
-        vars:
-          MONGODB_VERSION: 3.6
-          TOPOLOGY: sharded_cluster
-      - func: "run driver test suite"
-
   - name: test-4.0-sharded
     tags: [4.0, sharded]
     commands:
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ For more details, including features, runnable examples, troubleshooting resourc
 ## Installation
 ### Requirements
 - Rust 1.64+ (See the [MSRV policy](#minimum-supported-rust-version-msrv-policy) for more information)
-- MongoDB 3.6+
+- MongoDB 4.0+
 
 #### Supported Platforms
 
diff --git a/src/sdam/description/server.rs b/src/sdam/description/server.rs
@@ -13,8 +13,8 @@ use crate::{
     serde_util,
 };
 
-const DRIVER_MIN_DB_VERSION: &str = "3.6";
-const DRIVER_MIN_WIRE_VERSION: i32 = 6;
+const DRIVER_MIN_DB_VERSION: &str = "4.0";
+const DRIVER_MIN_WIRE_VERSION: i32 = 7;
 const DRIVER_MAX_WIRE_VERSION: i32 = 21;
 
 /// Enum representing the possible types of servers that the driver can connect to.
diff --git a/src/test/spec/json/server-discovery-and-monitoring/README.rst b/src/test/spec/json/server-discovery-and-monitoring/README.rst
@@ -262,6 +262,32 @@ Run the following test(s) on MongoDB 4.4+.
              mode: "off",
          });
 
+Heartbeat Tests
+~~~~~~~~~~~~~~~
+
+1. Test that ``ServerHeartbeatStartedEvent`` is emitted before the monitoring socket was created
+
+   #. Create a mock TCP server (example shown below) that pushes a ``client connected`` event to a shared array when a client connects and a ``client hello received`` event when the server receives the client hello and then closes the connection::
+         
+        let events = [];
+        server = createServer(clientSocket => {
+          events.push('client connected');
+
+          clientSocket.on('data', () => {
+            events.push('client hello received');
+            clientSocket.destroy();
+          });
+        });
+        server.listen(9999);
+
+   #. Create a client with ``serverSelectionTimeoutMS: 500`` and listen to ``ServerHeartbeatStartedEvent`` and ``ServerHeartbeatFailedEvent``, pushing the event name to the same shared array as the mock TCP server
+    
+   #. Attempt to connect client to previously created TCP server, catching the error when the client fails to connect
+
+   #. Assert that the first four elements in the array are: ::
+
+        ['serverHeartbeatStartedEvent', 'client connected', 'client hello received', 'serverHeartbeatFailedEvent']
+
 .. Section for links.
 
-.. _Server Description Equality: /source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#server-description-equality
+.. _Server Description Equality: /source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#server-description-equality
diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible.json b/src/test/spec/json/server-discovery-and-monitoring/rs/compatible.json
@@ -16,7 +16,7 @@
               "b:27017"
             ],
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ],
         [
diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible.yml b/src/test/spec/json/server-discovery-and-monitoring/rs/compatible.yml
@@ -12,7 +12,7 @@ phases: [
                     setName: "rs",
                     hosts: ["a:27017", "b:27017"],
                     minWireVersion: 0,
-                    maxWireVersion: 6
+                    maxWireVersion: 21
                 }],
                 ["b:27017", {
                     ok: 1,
diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.json b/src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.json
@@ -16,7 +16,7 @@
               "b:27017"
             ],
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ]
       ],
diff --git a/src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.yml b/src/test/spec/json/server-discovery-and-monitoring/rs/compatible_unknown.yml
@@ -12,7 +12,7 @@ phases: [
                     setName: "rs",
                     hosts: ["a:27017", "b:27017"],
                     minWireVersion: 0,
-                    maxWireVersion: 6
+                    maxWireVersion: 21
                 }],
         ],
         outcome: {
diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.json b/src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.json
@@ -23,7 +23,7 @@
             "isWritablePrimary": true,
             "msg": "isdbgrid",
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ]
       ],
diff --git a/src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.yml b/src/test/spec/json/server-discovery-and-monitoring/sharded/compatible.yml
@@ -17,7 +17,7 @@ phases: [
                     isWritablePrimary: true,
                     msg: "isdbgrid",
                     minWireVersion: 0,
-                    maxWireVersion: 6
+                    maxWireVersion: 21
                 }]
         ],
         outcome: {
diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/compatible.json b/src/test/spec/json/server-discovery-and-monitoring/single/compatible.json
@@ -11,7 +11,7 @@
             "helloOk": true,
             "isWritablePrimary": true,
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ]
       ],
diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/compatible.yml b/src/test/spec/json/server-discovery-and-monitoring/single/compatible.yml
@@ -8,7 +8,7 @@ phases: [
                     helloOk: true,
                     isWritablePrimary: true,
                     minWireVersion: 0,
-                    maxWireVersion: 6
+                    maxWireVersion: 21
                 }]
         ],
         outcome: {
diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.json b/src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.json
@@ -1,5 +1,5 @@
 {
-  "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6",
+  "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21",
   "uri": "mongodb://a",
   "phases": [
     {
@@ -35,7 +35,7 @@
             "helloOk": true,
             "isWritablePrimary": true,
             "minWireVersion": 0,
-            "maxWireVersion": 6
+            "maxWireVersion": 21
           }
         ]
       ],
diff --git a/src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.yml b/src/test/spec/json/server-discovery-and-monitoring/single/too_old_then_upgraded.yml
@@ -1,4 +1,4 @@
-description: "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6"
+description: "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21"
 uri: "mongodb://a"
 phases: [
     {
@@ -29,7 +29,7 @@ phases: [
                     helloOk: true,
                     isWritablePrimary: true,
                     minWireVersion: 0,
-                    maxWireVersion: 6
+                    maxWireVersion: 21
                 }]
         ],
         outcome: {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"b:27017"`
`17`	`17`	`],`
`18`	`18`	`"minWireVersion": 0,`
`19`		`- "maxWireVersion": 6`
	`19`	`+ "maxWireVersion": 21`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`[`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`"isWritablePrimary": true,`
`24`	`24`	`"msg": "isdbgrid",`
`25`	`25`	`"minWireVersion": 0,`
`26`		`- "maxWireVersion": 6`
	`26`	`+ "maxWireVersion": 21`
`27`	`27`	`}`
`28`	`28`	`]`
`29`	`29`	`],`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"helloOk": true,`
`12`	`12`	`"isWritablePrimary": true,`
`13`	`13`	`"minWireVersion": 0,`
`14`		`- "maxWireVersion": 6`
	`14`	`+ "maxWireVersion": 21`
`15`	`15`	`}`
`16`	`16`	`]`
`17`	`17`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6",`
	`2`	`+ "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21",`
`3`	`3`	`"uri": "mongodb://a",`
`4`	`4`	`"phases": [`
`5`	`5`	`{`
`@@ -35,7 +35,7 @@`
`35`	`35`	`"helloOk": true,`
`36`	`36`	`"isWritablePrimary": true,`
`37`	`37`	`"minWireVersion": 0,`
`38`		`- "maxWireVersion": 6`
	`38`	`+ "maxWireVersion": 21`
`39`	`39`	`}`
`40`	`40`	`]`
`41`	`41`	`],`