Merge branch 'mongodb:main' into main

Author: nhachicha

driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java

@@ -231,7 +231,7 @@ public void onChange(final ServerDescriptionChangedEvent event) {
 
     private boolean handleReplicaSetMemberChanged(final ServerDescription newDescription) {
         if (!newDescription.isReplicaSetMember()) {
-            LOGGER.error(format("Expecting replica set member, but found a %s.  Removing %s from client view of cluster.",
+            LOGGER.warn(format("Expecting replica set member, but found a %s.  Removing %s from client view of cluster.",
                                 newDescription.getType(), newDescription.getAddress()));
             removeServer(newDescription.getAddress());
             return true;
@@ -247,7 +247,7 @@ private boolean handleReplicaSetMemberChanged(final ServerDescription newDescrip
         }
 
         if (!replicaSetName.equals(newDescription.getSetName())) {
-            LOGGER.error(format("Expecting replica set member from set '%s', but found one from set '%s'.  "
+            LOGGER.warn(format("Expecting replica set member from set '%s', but found one from set '%s'.  "
                                  + "Removing %s from client view of cluster.",
                                  replicaSetName, newDescription.getSetName(), newDescription.getAddress()));
             removeServer(newDescription.getAddress());
@@ -259,7 +259,7 @@ private boolean handleReplicaSetMemberChanged(final ServerDescription newDescrip
         if (newDescription.getCanonicalAddress() != null
                 && !newDescription.getAddress().equals(new ServerAddress(newDescription.getCanonicalAddress()))
                 && !newDescription.isPrimary()) {
-            LOGGER.info(format("Canonical address %s does not match server address.  Removing %s from client view of cluster",
+            LOGGER.warn(format("Canonical address %s does not match server address.  Removing %s from client view of cluster",
                     newDescription.getCanonicalAddress(), newDescription.getAddress()));
             removeServer(newDescription.getAddress());
             return true;
@@ -342,7 +342,7 @@ private boolean isNotAlreadyPrimary(final ServerAddress address) {
 
     private boolean handleShardRouterChanged(final ServerDescription newDescription) {
         if (!newDescription.isShardRouter()) {
-            LOGGER.error(format("Expecting a %s, but found a %s.  Removing %s from client view of cluster.",
+            LOGGER.warn(format("Expecting a %s, but found a %s.  Removing %s from client view of cluster.",
                     SHARD_ROUTER, newDescription.getType(), newDescription.getAddress()));
             removeServer(newDescription.getAddress());
         }
@@ -351,7 +351,7 @@ private boolean handleShardRouterChanged(final ServerDescription newDescription)
 
     private boolean handleStandAloneChanged(final ServerDescription newDescription) {
         if (getSettings().getHosts().size() > 1) {
-            LOGGER.error(format("Expecting a single %s, but found more than one.  Removing %s from client view of cluster.",
+            LOGGER.warn(format("Expecting a single %s, but found more than one.  Removing %s from client view of cluster.",
                                  STANDALONE, newDescription.getAddress()));
             clusterType = UNKNOWN;
             removeServer(newDescription.getAddress());

driver-core/src/test/resources/specifications

@@ -56,6 +56,10 @@ public void shouldPassAllOutcomes() {
         assumeFalse(description.equals("should accept forwardAndReverse hostname canonicalization (GSSAPI)"));
         assumeFalse(description.equals("should accept generic mechanism property (GSSAPI)"));
         assumeFalse(description.equals("should accept no hostname canonicalization (GSSAPI)"));
+        assumeFalse("https://jira.mongodb.org/browse/JAVA-6030",
+                description.equals("should throw an exception if AWS_SESSION_TOKEN provided (MONGODB-AWS)"));
+        assumeFalse("https://jira.mongodb.org/browse/JAVA-6030",
+                description.equals("should throw an exception if username and password provided (MONGODB-AWS)"));
 
         if (definition.getBoolean("valid").getValue()) {
             testValidUris();

driver-core/src/test/unit/com/mongodb/AuthConnectionStringTest.java

@@ -54,6 +54,9 @@ public class ServerDiscoveryAndMonitoringTest extends AbstractServerDiscoveryAnd
 
     public ServerDiscoveryAndMonitoringTest(final String description, final BsonDocument definition) {
         super(definition);
+        assumeFalse("https://jira.mongodb.org/browse/JAVA-5949",
+                description.equals("error_handling_handshake.json: Network timeouts before and after the handshake completes"));
+
         this.description = description;
         init(serverAddress -> NO_OP_SERVER_LISTENER, NO_OP_CLUSTER_LISTENER);
     }

driver-core/src/test/unit/com/mongodb/internal/connection/ServerDiscoveryAndMonitoringTest.java

@@ -420,6 +420,24 @@ public static void applyCustomizations(final TestDef def) {
                 .file("server-discovery-and-monitoring", "pool-clear-on-error-checkout");
         def.skipJira("https://jira.mongodb.org/browse/JAVA-5664")
                 .file("server-discovery-and-monitoring", "pool-cleared-on-min-pool-size-population-error");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5949")
+                .file("server-discovery-and-monitoring", "backpressure-network-error-fail");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5949")
+                .file("server-discovery-and-monitoring", "backpressure-network-timeout-error");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5949")
+                .file("server-discovery-and-monitoring", "backpressure-server-description-unchanged-on-min-pool-size-population-error");
+
+        // session tests
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5968")
+                .test("sessions", "snapshot-sessions", "Find operation with snapshot and snapshot time");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5968")
+                .test("sessions", "snapshot-sessions", "Distinct operation with snapshot and snapshot time");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5968")
+                .test("sessions", "snapshot-sessions", "Aggregate operation with snapshot and snapshot time");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5968")
+                .test("sessions", "snapshot-sessions", "countDocuments operation with snapshot and snapshot time");
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5968")
+                .test("sessions", "snapshot-sessions", "Mixed operation with snapshot and snapshotTime");
 
         // transactions