reuse conn if empty ccrsUri

Author: veceraj

cmd/pbm-agent/main.go

@@ -52,10 +52,6 @@ func rootCommand() *cobra.Command {
 
 			fmt.Println("--- ccrsURL:", ccrsURL)
 
-			if ccrsURL == "" {
-				ccrsURL = url
-			}
-
 			hidecreds()
 
 			logOpts := buildLogOpts()
@@ -208,9 +204,12 @@ func runAgent(
 		return errors.Wrap(err, "connect to PBM")
 	}
 
-	ccrsConn, err := connect.Connect(ctx, ccrsURI, "pbm-agent-ccrs")
-	if err != nil {
-		return errors.Wrap(err, "connect to CCRS")
+	ccrsConn := leadConn
+	if ccrsURI != "" && ccrsURI != mongoURI {
+		ccrsConn, err = connect.Connect(ctx, ccrsURI, "pbm-agent-ccrs")
+		if err != nil {
+			return errors.Wrap(err, "connect to CCRS")
+		}
 	}
 
 	err = setupNewDB(ctx, ccrsConn)

cmd/pbm/main.go

@@ -183,10 +183,6 @@ func (app *pbmApp) persistentPreRun(cmd *cobra.Command, args []string) error {
 
 	app.ccrsURI = viper.GetString(ccrsConnFlag)
 
-	if app.ccrsURI == "" {
-		app.ccrsURI = app.mURL
-	}
-
 	if viper.GetString("describe-restore.config") != "" || viper.GetString("restore-finish.config") != "" {
 		return nil
 	}
@@ -197,11 +193,6 @@ func (app *pbmApp) persistentPreRun(cmd *cobra.Command, args []string) error {
 		exitErr(errors.Wrap(err, "connect to mongodb"), app.pbmOutF)
 	}
 
-	app.ccrsConn, err = connect.Connect(app.ctx, app.ccrsURI, "pbm-ctl-ccrs")
-	if err != nil {
-		exitErr(errors.Wrap(err, "connect to ccrs"), app.pbmOutF)
-	}
-
 	app.ctx = log.SetLoggerToContext(app.ctx, log.New(app.conn, "", ""))
 
 	ver, err := version.GetMongoVersion(app.ctx, app.conn.MongoClient())
@@ -218,6 +209,16 @@ func (app *pbmApp) persistentPreRun(cmd *cobra.Command, args []string) error {
 		exitErr(errors.Wrap(err, "init sdk"), app.pbmOutF)
 	}
 
+	if app.ccrsURI == "" || app.ccrsURI == app.mURL {
+		app.ccrsConn = app.conn
+		app.ccrsURI = app.mURL
+	} else {
+		app.ccrsConn, err = connect.Connect(app.ctx, app.ccrsURI, "pbm-ctl-ccrs")
+		if err != nil {
+			exitErr(errors.Wrap(err, "connect to ccrs"), app.pbmOutF)
+		}
+	}
+
 	inf, err := topo.GetNodeInfo(app.ctx, app.conn.MongoClient())
 	if err != nil {
 		exitErr(errors.Wrap(err, "unable to obtain node info"), app.pbmOutF)

sdk/sdk.go

@@ -138,9 +138,12 @@ func NewClient(ctx context.Context, uri, ccrsURI string) (*Client, error) {
 		return nil, err
 	}
 
-	ccrsConn, err := connect.Connect(ctx, ccrsURI, "sdk-ccrs")
-	if err != nil {
-		return nil, err
+	ccrsConn := conn
+	if ccrsURI != "" && ccrsURI != uri {
+		ccrsConn, err = connect.Connect(ctx, ccrsURI, "sdk-ccrs")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	inf, err := topo.GetNodeInfo(ctx, conn.MongoClient())