RUST-979 Non-unified spec tests for load balancer support behavior

src/client/options/mod.rs

@@ -37,6 +37,8 @@ use strsim::jaro_winkler;
 use typed_builder::TypedBuilder;
 use webpki_roots::TLS_SERVER_ROOTS;
 
+#[cfg(test)]
+use crate::srv::LookupHosts;
 use crate::{
     bson::{doc, Bson, Document},
     bson_util,
@@ -543,20 +545,30 @@ pub struct ClientOptions {
     #[serde(skip)]
     pub(crate) resolver_config: Option<ResolverConfig>,
 
-    /// Used by tests to override MIN_HEARTBEAT_FREQUENCY.
-    #[builder(default)]
-    #[cfg(test)]
-    pub(crate) heartbeat_freq_test: Option<Duration>,
+    /// Whether or not the client is connecting to a MongoDB cluster through a load balancer.
+    #[builder(default, setter(skip))]
+    #[serde(rename = "loadbalanced")]
+    pub(crate) load_balanced: Option<bool>,
 
-    /// Allow use of the `load_balanced` option.
-    // TODO RUST-653 Remove this when load balancer work is ready for release.
+    /// Control test behavior of the client.
+    #[cfg(test)]
     #[builder(default, setter(skip))]
     #[serde(skip)]
-    pub(crate) allow_load_balanced: bool,
+    #[derivative(PartialEq = "ignore")]
+    pub(crate) test_options: Option<TestOptions>,
+}
 
-    /// Whether or not the client is connecting to a MongoDB cluster through a load balancer.
-    #[builder(default, setter(skip))]
-    pub(crate) load_balanced: Option<bool>,
+#[cfg(test)]
+#[derive(Debug, Clone, Default)]
+pub(crate) struct TestOptions {
+    /// Override MIN_HEARTBEAT_FREQUENCY.
+    pub(crate) heartbeat_freq: Option<Duration>,
+
+    /// Disable server and SRV-polling monitor threads.
+    pub(crate) disable_monitoring_threads: bool,
+
+    /// Mock response for `SrvPollingMonitor::lookup_hosts`.
+    pub(crate) mock_lookup_hosts: Option<Result<LookupHosts>>,
 }
 
 fn default_hosts() -> Vec<ServerAddress> {
@@ -629,6 +641,8 @@ impl Serialize for ClientOptions {
             writeconcern: &'a Option<WriteConcern>,
 
             zlibcompressionlevel: &'a Option<i32>,
+
+            loadbalanced: &'a Option<bool>,
         }
 
         let client_options = ClientOptionsHelper {
@@ -652,6 +666,7 @@ impl Serialize for ClientOptions {
             tls: &self.tls,
             writeconcern: &self.write_concern,
             zlibcompressionlevel: &self.zlib_compression,
+            loadbalanced: &self.load_balanced,
         };
 
         client_options.serialize(serializer)
@@ -921,11 +936,10 @@ impl From<ClientOptionsParser> for ClientOptions {
             original_uri: Some(parser.original_uri),
             resolver_config: None,
             server_api: None,
-            #[cfg(test)]
-            heartbeat_freq_test: None,
-            allow_load_balanced: false,
             load_balanced: parser.load_balanced,
             sdam_event_handler: None,
+            #[cfg(test)]
+            test_options: None,
         }
     }
 }
@@ -1132,7 +1146,9 @@ impl ClientOptions {
             write_concern.validate()?;
         }
 
-        if !self.allow_load_balanced && self.load_balanced.is_some() {
+        // Disallow use of load-balanced configurations in non-test code.
+        // TODO RUST-653 Remove this when load balancer work is ready for release.
+        if !cfg!(test) && self.load_balanced.is_some() {
             return Err(ErrorKind::InvalidArgument {
                 message: "loadBalanced is not supported".to_string(),
             }
@@ -1200,6 +1216,11 @@ impl ClientOptions {
             ]
         );
     }
+
+    #[cfg(test)]
+    pub(crate) fn test_options_mut(&mut self) -> &mut TestOptions {
+        self.test_options.get_or_insert_with(Default::default)
+    }
 }
 
 /// Splits a string into a section before a given index and a section exclusively after the index.

src/sdam/description/topology/server_selection/test/logic.rs

@@ -150,6 +150,21 @@ async fn server_selection_unknown() {
     .await;
 }
 
+#[cfg_attr(feature = "tokio-runtime", tokio::test)]
+#[cfg_attr(feature = "async-std-runtime", async_std::test)]
+async fn server_selection_load_balanced() {
+    run_spec_test(
+        &[
+            "server-selection",
+            "server_selection",
+            "LoadBalanced",
+            "read",
+        ],
+        run_test,
+    )
+    .await;
+}
+
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
 async fn max_staleness_replica_set_no_primary() {

src/sdam/description/topology/server_selection/test/mod.rs

@@ -134,6 +134,7 @@ enum TestServerType {
     RsOther,
     #[serde(rename = "RSGhost")]
     RsGhost,
+    LoadBalancer,
     Unknown,
     PossiblePrimary,
 }
@@ -148,6 +149,7 @@ impl TestServerType {
             TestServerType::RsArbiter => Some(ServerType::RsArbiter),
             TestServerType::RsOther => Some(ServerType::RsOther),
             TestServerType::RsGhost => Some(ServerType::RsGhost),
+            TestServerType::LoadBalancer => Some(ServerType::LoadBalancer),
             TestServerType::Unknown => Some(ServerType::Unknown),
             TestServerType::PossiblePrimary => None,
         }

src/sdam/description/topology/test/event.rs

@@ -81,7 +81,7 @@ impl PartialEq<TestServerDescription> for ServerDescription {
                     && other.passives.is_empty()
                     && other.primary.is_none()
                     && other.set_name.is_none()
-                    && other.server_type == ServerType::Unknown
+                    && other.server_type == self.server_type
             }
         }
     }

src/sdam/description/topology/test/sdam.rs

@@ -225,6 +225,7 @@ fn server_type_from_str(s: &str) -> Option<ServerType> {
         "RSArbiter" => ServerType::RsArbiter,
         "RSOther" => ServerType::RsOther,
         "RSGhost" => ServerType::RsGhost,
+        "LoadBalancer" => ServerType::LoadBalancer,
         "Unknown" | "PossiblePrimary" => ServerType::Unknown,
         _ => return None,
     };
@@ -241,20 +242,15 @@ async fn run_test(test_file: TestFile) {
         return;
     }
 
-    // TODO RUST-653 unskip load balancer test
-    if test_description.contains("load balancer") {
-        println!("Skipping {} (RUST-653)", test_description);
-        return;
-    }
-
     let mut options = ClientOptions::parse_uri(&test_file.uri, None)
         .await
         .expect(test_description);
 
     let handler = Arc::new(EventHandler::new());
     options.sdam_event_handler = Some(handler.clone());
+    options.test_options_mut().disable_monitoring_threads = true;
 
-    let topology = Topology::new_mocked(options.clone());
+    let topology = Topology::new(options.clone()).unwrap();
     let mut servers = topology.get_servers().await;
 
     for (i, phase) in test_file.phases.into_iter().enumerate() {
@@ -351,7 +347,13 @@ async fn run_test(test_file: TestFile) {
             }
             Outcome::Events(EventsOutcome { events: expected }) => {
                 let actual = handler.get_all_sdam_events();
-                assert_eq!(actual.len(), expected.len());
+                assert_eq!(
+                    actual.len(),
+                    expected.len(),
+                    "event list length mismatch:\n actual: {:#?}, expected: {:#?}",
+                    actual,
+                    expected
+                );
                 for (actual, expected) in actual.iter().zip(expected.iter()) {
                     assert_eq!(
                         actual, expected,
@@ -522,6 +524,16 @@ async fn monitoring() {
     run_spec_test(&["server-discovery-and-monitoring", "monitoring"], run_test).await;
 }
 
+#[cfg_attr(feature = "tokio-runtime", tokio::test)]
+#[cfg_attr(feature = "async-std-runtime", async_std::test)]
+async fn load_balanced() {
+    run_spec_test(
+        &["server-discovery-and-monitoring", "load-balanced"],
+        run_test,
+    )
+    .await;
+}
+
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
 #[function_name::named]
@@ -676,10 +688,11 @@ async fn direct_connection() {
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
 async fn pool_cleared_error_does_not_mark_unknown() {
     let address = ServerAddress::parse("a:1234").unwrap();
-    let options = ClientOptions::builder()
+    let mut options = ClientOptions::builder()
         .hosts(vec![address.clone()])
         .build();
-    let topology = Topology::new_mocked(options);
+    options.test_options_mut().disable_monitoring_threads = true;
+    let topology = Topology::new(options).unwrap();
 
     // get the one server in the topology
     let server = topology

src/sdam/monitor.rs

@@ -139,7 +139,9 @@ impl HeartbeatMonitor {
             #[cfg(test)]
             let min_frequency = self
                 .client_options
-                .heartbeat_freq_test
+                .test_options
+                .as_ref()
+                .and_then(|to| to.heartbeat_freq)
                 .unwrap_or(MIN_HEARTBEAT_FREQUENCY);
 
             #[cfg(not(test))]

src/sdam/srv_polling/mod.rs

@@ -112,6 +112,15 @@ impl SrvPollingMonitor {
     }
 
     async fn lookup_hosts(&mut self) -> Result<LookupHosts> {
+        #[cfg(test)]
+        if let Some(mock) = self
+            .client_options
+            .test_options
+            .as_ref()
+            .and_then(|to| to.mock_lookup_hosts.as_ref())
+        {
+            return mock.clone();
+        }
         let initial_hostname = self.initial_hostname.clone();
         let resolver = self.get_or_create_srv_resolver().await?;
         resolver.get_srv_hosts(initial_hostname.as_str()).await

src/sdam/srv_polling/test.rs

@@ -7,6 +7,7 @@ use crate::{
     error::Result,
     options::{ClientOptions, ServerAddress},
     sdam::Topology,
+    RUNTIME,
 };
 
 fn localhost_test_build_10gen(port: u16) -> ServerAddress {
@@ -26,22 +27,23 @@ lazy_static::lazy_static! {
 async fn run_test(new_hosts: Result<Vec<ServerAddress>>, expected_hosts: HashSet<ServerAddress>) {
     let mut options = ClientOptions::new_srv();
     options.hosts = DEFAULT_HOSTS.clone();
-    let topology = Topology::new_mocked(options);
+    options.test_options_mut().disable_monitoring_threads = true;
+    let topology = Topology::new(options).unwrap();
     let mut monitor = SrvPollingMonitor::new(topology.downgrade()).unwrap();
-
     monitor
-        .update_hosts(
-            new_hosts.map(|hosts| LookupHosts {
-                hosts: hosts.into_iter().map(Result::Ok).collect(),
-                min_ttl: Duration::from_secs(60),
-            }),
-            topology.clone(),
-        )
+        .update_hosts(new_hosts.and_then(make_lookup_hosts), topology.clone())
         .await;
 
     assert_eq!(expected_hosts, topology.servers().await);
 }
 
+fn make_lookup_hosts(hosts: Vec<ServerAddress>) -> Result<LookupHosts> {
+    Ok(LookupHosts {
+        hosts: hosts.into_iter().map(Result::Ok).collect(),
+        min_ttl: Duration::from_secs(60),
+    })
+}
+
 // If a new DNS record is returned, it should be reflected in the topology.
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
@@ -102,3 +104,25 @@ async fn timeout_error() {
 async fn no_results() {
     run_test(Ok(Vec::new()), DEFAULT_HOSTS.iter().cloned().collect()).await;
 }
+
+// SRV polling is not done for load-balanced clusters (as per spec at
+// https://github.com/mongodb/specifications/blob/master/source/polling-srv-records-for-mongos-discovery/tests/README.rst#test-that-srv-polling-is-not-done-for-load-balalanced-clusters).
+#[cfg_attr(feature = "tokio-runtime", tokio::test)]
+#[cfg_attr(feature = "async-std-runtime", async_std::test)]
+async fn load_balanced_no_srv_polling() {
+    let hosts = vec![localhost_test_build_10gen(27017)];
+    let mut options = ClientOptions::new_srv();
+    let rescan_interval = options.original_srv_info.as_ref().cloned().unwrap().min_ttl;
+    options.hosts = hosts.clone();
+    options.load_balanced = Some(true);
+    options.test_options_mut().mock_lookup_hosts = Some(make_lookup_hosts(vec![
+        localhost_test_build_10gen(27017),
+        localhost_test_build_10gen(27018),
+    ]));
+    let topology = Topology::new(options).unwrap();
+    RUNTIME.delay_for(rescan_interval * 2).await;
+    assert_eq!(
+        hosts.into_iter().collect::<HashSet<_>>(),
+        topology.servers().await
+    );
+}