NVIDIA
diff --git a/‎cmd/cli/cli/cluster_hdlr.go
Lines changed: 23 additions & 21 deletions b/‎cmd/cli/cli/cluster_hdlr.go
Lines changed: 23 additions & 21 deletions
diff --git a/‎cmd/cli/cli/smap.go
Lines changed: 1 addition & 1 deletion b/‎cmd/cli/cli/smap.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎tools/node.go
Lines changed: 1 addition & 1 deletion b/‎tools/node.go
Lines changed: 1 addition & 1 deletion
@@ -519,31 +519,32 @@ func setPrimaryHandler(c *cli.Context) error {
 	if c.NArg() == 0 {
 		return missingArgumentsError(c, c.Command.ArgsUsage)
 	}
+	node, sname, err := arg0Node(c)
+	if err != nil {
+		return err
+	}
+	if !node.IsProxy() {
+		return incorrectUsageMsg(c, "%s is not a proxy", sname)
+	}
+
+	// force
 	var (
-		toID  = c.Args().Get(0)
 		toURL = c.Args().Get(1)
 		force = flagIsSet(c, forceFlag)
 	)
 	if force {
-		err := api.SetPrimary(apiBP, toID, toURL, force)
-		if err == nil {
-			var s string
-			if toURL != "" {
-				s = " (at " + toURL + ")"
-			}
-			actionDone(c, fmt.Sprintf("%s%s is now a new primary", toID, s))
+		if err := api.SetPrimary(apiBP, node.ID(), toURL, true /*force*/); err != nil {
+			return err
 		}
-		return err
-	}
-
-	node, sname, err := getNode(c, toID)
-	if err != nil {
-		return err
-	}
-	if !node.IsProxy() {
-		return incorrectUsageMsg(c, "%s is not a proxy", sname)
+		var s string
+		if toURL != "" {
+			s = " (at " + toURL + ")"
+		}
+		actionDone(c, fmt.Sprintf("%s%s is now a new primary", sname, s))
+		return nil
 	}
 
+	// regular
 	switch {
 	case node.Flags.IsSet(meta.SnodeMaint):
 		return fmt.Errorf("%s is currently in maintenance", sname)
@@ -553,11 +554,12 @@ func setPrimaryHandler(c *cli.Context) error {
 		return fmt.Errorf("%s is non-electable", sname)
 	}
 
-	err = api.SetPrimary(apiBP, toID, toURL, force)
-	if err == nil {
-		actionDone(c, sname+" is now a new primary")
+	if err := api.SetPrimary(apiBP, node.ID(), toURL, false /*force*/); err != nil {
+		return err
 	}
-	return err
+
+	actionDone(c, sname+" is now a new primary")
+	return nil
 }
 
 func startRebHandler(c *cli.Context) (err error) {
 
@@ -73,7 +73,7 @@ func getNode(c *cli.Context, arg string) (node *meta.Snode, sname string, err er
 		err = &errDoesNotExist{
 			what:   "node",
 			name:   arg,
-			suffix: " (" + tabHelpOpt + ", or see 'ais show cluster')",
+			suffix: " (" + tabHelpOpt + ", check available nodes by running 'ais show cluster')",
 		}
 		return
 	}
 
@@ -299,7 +299,7 @@ func pidFromURL(smap *meta.Smap, proxyURL string) string {
 }
 
 func WaitForNewSmap(proxyURL string, prevVersion int64) (newSmap *meta.Smap, err error) {
-	return WaitForClusterState(proxyURL, "new smap version", prevVersion, 0, 0)
+	return WaitForClusterState(proxyURL, "new Smap version", prevVersion, 0, 0)
 }
 
 func WaitForResilvering(t *testing.T, bp api.BaseParams, target *meta.Snode) {
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func getNode(c cli.Context, arg string) (node meta.Snode, sname string, err er`
`73`	`73`	`err = &errDoesNotExist{`
`74`	`74`	`what: "node",`
`75`	`75`	`name: arg,`
`76`		`- suffix: " (" + tabHelpOpt + ", or see 'ais show cluster')",`
	`76`	`+ suffix: " (" + tabHelpOpt + ", check available nodes by running 'ais show cluster')",`
`77`	`77`	`}`
`78`	`78`	`return`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ func pidFromURL(smap *meta.Smap, proxyURL string) string {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`func WaitForNewSmap(proxyURL string, prevVersion int64) (newSmap *meta.Smap, err error) {`
`302`		`- return WaitForClusterState(proxyURL, "new smap version", prevVersion, 0, 0)`
	`302`	`+ return WaitForClusterState(proxyURL, "new Smap version", prevVersion, 0, 0)`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`func WaitForResilvering(t testing.T, bp api.BaseParams, target meta.Snode) {`