allow server monitoring to be disabled for tests

Author: Divjot Arora

x/mongo/driver/topology/rtt_monitor.go

@@ -59,17 +59,15 @@ func (r *rttMonitor) disconnect() {
 	conn = r.conn
 	r.Unlock()
 
-	if conn == nil {
-		return
+	if conn != nil {
+		// If the connection exists, we need to wait for it to be connected. We can ignore the error from conn.wait().
+		// If the connection wasn't successfully opened, its state was set back to disconnected, so calling conn.close()
+		// will be a noop.
+		conn.closeConnectContext()
+		_ = conn.wait()
+		_ = conn.close()
 	}
 
-	// If the connection exists, we need to wait for it to be connected. We can ignore the error from conn.wait(). If
-	// the connection wasn't successfully opened, its state was set back to disconnected, so calling conn.close() will
-	// be a noop.
-	conn.closeConnectContext()
-	_ = conn.wait()
-	_ = conn.close()
-
 	r.closeWg.Wait()
 }
 

x/mongo/driver/topology/sdam_spec_test.go

@@ -137,9 +137,21 @@ func setUpTopology(t *testing.T, uri string) *Topology {
 	cs, err := connstring.ParseAndValidate(uri)
 	assert.Nil(t, err, "Parse error: %v", err)
 
-	topo, err := New(WithConnString(func(connstring.ConnString) connstring.ConnString {
-		return cs
-	}))
+	// Disable server monitoring because the hosts in the SDAM spec tests don't actually exist, so the server monitor
+	// can race with the test and mark the server Unknown when it fails to connect, which causes tests to fail.
+	serverOpts := []ServerOption{
+		withMonitoringDisabled(func(bool) bool {
+			return true
+		}),
+	}
+	topo, err := New(
+		WithConnString(func(connstring.ConnString) connstring.ConnString {
+			return cs
+		}),
+		WithServerOptions(func(opts ...ServerOption) []ServerOption {
+			return append(opts, serverOpts...)
+		}),
+	)
 	assert.Nil(t, err, "topology.New error: %v", err)
 
 	// add servers to topology without starting heartbeat goroutines

x/mongo/driver/topology/server.go

@@ -191,9 +191,12 @@ func (s *Server) Connect(updateCallback updateTopologyCallback) error {
 	}
 	s.desc.Store(description.NewDefaultServer(s.address))
 	s.updateTopologyCallback.Store(updateCallback)
-	s.rttMonitor.connect()
-	s.closewg.Add(1)
-	go s.update()
+
+	if !s.cfg.monitoringDisabled {
+		s.rttMonitor.connect()
+		s.closewg.Add(1)
+		go s.update()
+	}
 	return s.pool.connect()
 }
 

x/mongo/driver/topology/server_options.go

@@ -29,6 +29,7 @@ type serverConfig struct {
 	poolMonitor               *event.PoolMonitor
 	connectionPoolMaxIdleTime time.Duration
 	registry                  *bsoncodec.Registry
+	monitoringDisabled        bool
 }
 
 func newServerConfig(opts ...ServerOption) (*serverConfig, error) {
@@ -52,6 +53,13 @@ func newServerConfig(opts ...ServerOption) (*serverConfig, error) {
 // ServerOption configures a server.
 type ServerOption func(*serverConfig) error
 
+func withMonitoringDisabled(fn func(bool) bool) ServerOption {
+	return func(cfg *serverConfig) error {
+		cfg.monitoringDisabled = fn(cfg.monitoringDisabled)
+		return nil
+	}
+}
+
 // WithConnectionOptions configures the server's connections.
 func WithConnectionOptions(fn func(...ConnectionOption) []ConnectionOption) ServerOption {
 	return func(cfg *serverConfig) error {