GODRIVER-1742 Remove connection life timeout (#499)

Author: Divjot Arora

x/mongo/driver/topology/connection.go

@@ -36,7 +36,6 @@ type connection struct {
 	addr                 address.Address
 	idleTimeout          time.Duration
 	idleDeadline         atomic.Value // Stores a time.Time
-	lifetimeDeadline     time.Time
 	readTimeout          time.Duration
 	writeTimeout         time.Duration
 	desc                 description.Server
@@ -68,18 +67,12 @@ func newConnection(addr address.Address, opts ...ConnectionOption) (*connection,
 		return nil, err
 	}
 
-	var lifetimeDeadline time.Time
-	if cfg.lifeTimeout > 0 {
-		lifetimeDeadline = time.Now().Add(cfg.lifeTimeout)
-	}
-
 	id := fmt.Sprintf("%s[-%d]", addr, nextConnectionID())
 
 	c := &connection{
 		id:                 id,
 		addr:               addr,
 		idleTimeout:        cfg.idleTimeout,
-		lifetimeDeadline:   lifetimeDeadline,
 		readTimeout:        cfg.readTimeout,
 		writeTimeout:       cfg.writeTimeout,
 		connectDone:        make(chan struct{}),
@@ -383,9 +376,6 @@ func (c *connection) idleTimeoutExpired() bool {
 		}
 	}
 
-	if !c.lifetimeDeadline.IsZero() && now.After(c.lifetimeDeadline) {
-		return true
-	}
 	return false
 }
 

x/mongo/driver/topology/connection_options.go

@@ -41,7 +41,6 @@ type connectionConfig struct {
 	dialer                   Dialer
 	handshaker               Handshaker
 	idleTimeout              time.Duration
-	lifeTimeout              time.Duration
 	cmdMonitor               *event.CommandMonitor
 	readTimeout              time.Duration
 	writeTimeout             time.Duration
@@ -59,7 +58,6 @@ func newConnectionConfig(opts ...ConnectionOption) (*connectionConfig, error) {
 	cfg := &connectionConfig{
 		connectTimeout:      30 * time.Second,
 		dialer:              nil,
-		lifeTimeout:         30 * time.Minute,
 		tlsConnectionSource: defaultTLSConnectionSource,
 	}
 
@@ -136,14 +134,6 @@ func WithIdleTimeout(fn func(time.Duration) time.Duration) ConnectionOption {
 	}
 }
 
-// WithLifeTimeout configures the maximum life of a connection.
-func WithLifeTimeout(fn func(time.Duration) time.Duration) ConnectionOption {
-	return func(c *connectionConfig) error {
-		c.lifeTimeout = fn(c.lifeTimeout)
-		return nil
-	}
-}
-
 // WithReadTimeout configures the maximum read time for a connection.
 func WithReadTimeout(fn func(time.Duration) time.Duration) ConnectionOption {
 	return func(c *connectionConfig) error {

x/mongo/driver/topology/pool_test.go

@@ -676,13 +676,15 @@ func TestPool(t *testing.T) {
 				MinPoolSize: 1,
 			}
 			maintainInterval = time.Second
-			p, err := newPool(pc, WithDialer(func(Dialer) Dialer { return d }),
-				WithLifeTimeout(func(time.Duration) time.Duration { return 10 * time.Millisecond }),
-			)
+			p, err := newPool(pc, WithDialer(func(Dialer) Dialer { return d }))
 			maintainInterval = time.Minute
 			noerr(t, err)
 			err = p.connect()
 			noerr(t, err)
+
+			// Increment the pool's generation number so the connection will be considered stale and will be closed by
+			// get().
+			p.clear()
 			_, err = p.get(context.Background())
 			noerr(t, err)
 		})