GODRIVER-1489 Ensure server check is cancelled for network errors during handshake (#471)

Divjot Arora · Divjot Arora · commit 35c4b30acad5 · 2020-07-29T15:28:01.000-04:00
diff --git a/mongo/integration/json_helpers_test.go b/mongo/integration/json_helpers_test.go
@@ -98,7 +98,7 @@ func createClientOptions(t testing.TB, opts bson.Raw) *options.ClientOptions {
 			clientOpts.SetConnectTimeout(ct)
 		case "serverSelectionTimeoutMS":
 			sst := convertValueToMilliseconds(t, opt)
-			clientOpts.SetConnectTimeout(sst)
+			clientOpts.SetServerSelectionTimeout(sst)
 		default:
 			t.Fatalf("unrecognized client option: %v", name)
 		}
diff --git a/x/mongo/driver/topology/server.go b/x/mongo/driver/topology/server.go
@@ -276,6 +276,7 @@ func (s *Server) ProcessHandshakeError(err error, startingGenerationNumber uint6
 	// checking logic above has already determined that this description is not stale.
 	s.updateDescription(description.NewServerFromError(s.address, wrappedConnErr, nil))
 	s.pool.clear()
+	s.cancelCheck()
 }
 
 // Description returns a description of the server as of the last heartbeat.

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func createClientOptions(t testing.TB, opts bson.Raw) *options.ClientOptions {`
`98`	`98`	`clientOpts.SetConnectTimeout(ct)`
`99`	`99`	`case "serverSelectionTimeoutMS":`
`100`	`100`	`sst := convertValueToMilliseconds(t, opt)`
`101`		`- clientOpts.SetConnectTimeout(sst)`
	`101`	`+ clientOpts.SetServerSelectionTimeout(sst)`
`102`	`102`	`default:`
`103`	`103`	`t.Fatalf("unrecognized client option: %v", name)`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ func (s *Server) ProcessHandshakeError(err error, startingGenerationNumber uint6`
`276`	`276`	`// checking logic above has already determined that this description is not stale.`
`277`	`277`	`s.updateDescription(description.NewServerFromError(s.address, wrappedConnErr, nil))`
`278`	`278`	`s.pool.clear()`
	`279`	`+ s.cancelCheck()`
`279`	`280`	`}`
`280`	`281`
`281`	`282`	`// Description returns a description of the server as of the last heartbeat.`