PMM-13426: close connections on failure (#1039)

idoqo · web-flow · commit 489a24b530a8 · 2024-10-23T15:09:02.000+02:00
diff --git a/pbm/connect/connect.go b/pbm/connect/connect.go
@@ -201,6 +201,7 @@ func Connect(ctx context.Context, uri, appName string) (*clientImpl, error) {
 
 	inf, err := getNodeInfo(ctx, client)
 	if err != nil {
+		_ = client.Disconnect(ctx)
 		return nil, errors.Wrap(err, "get NodeInfo")
 	}
 	if inf.isMongos() {
@@ -212,6 +213,7 @@ func Connect(ctx context.Context, uri, appName string) (*clientImpl, error) {
 
 	inf.Opts, err = getMongodOpts(ctx, client, nil)
 	if err != nil {
+		_ = client.Disconnect(ctx)
 		return nil, errors.Wrap(err, "get mongod options")
 	}
 
@@ -224,6 +226,7 @@ func Connect(ctx context.Context, uri, appName string) (*clientImpl, error) {
 
 	csvr, err := getConfigsvrURI(ctx, client)
 	if err != nil {
+		_ = client.Disconnect(ctx)
 		return nil, errors.Wrap(err, "get config server connection URI")
 	}
 	// no need in this connection anymore, we need a new one with the ConfigServer

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,7 @@ func Connect(ctx context.Context, uri, appName string) (*clientImpl, error) {`
`201`	`201`
`202`	`202`	`inf, err := getNodeInfo(ctx, client)`
`203`	`203`	`if err != nil {`
	`204`	`+ _ = client.Disconnect(ctx)`
`204`	`205`	`return nil, errors.Wrap(err, "get NodeInfo")`
`205`	`206`	`}`
`206`	`207`	`if inf.isMongos() {`
`@@ -212,6 +213,7 @@ func Connect(ctx context.Context, uri, appName string) (*clientImpl, error) {`
`212`	`213`
`213`	`214`	`inf.Opts, err = getMongodOpts(ctx, client, nil)`
`214`	`215`	`if err != nil {`
	`216`	`+ _ = client.Disconnect(ctx)`
`215`	`217`	`return nil, errors.Wrap(err, "get mongod options")`
`216`	`218`	`}`
`217`	`219`
`@@ -224,6 +226,7 @@ func Connect(ctx context.Context, uri, appName string) (*clientImpl, error) {`
`224`	`226`
`225`	`227`	`csvr, err := getConfigsvrURI(ctx, client)`
`226`	`228`	`if err != nil {`
	`229`	`+ _ = client.Disconnect(ctx)`
`227`	`230`	`return nil, errors.Wrap(err, "get config server connection URI")`
`228`	`231`	`}`
`229`	`232`	`// no need in this connection anymore, we need a new one with the ConfigServer`