cli: 'start rebalance [--cleanup]' to show ID; add formatted action helpers

alex-aizman · alex-aizman · commit 785a1b769c09 · 2026-05-11T14:08:38.000-04:00
* report the started rebalance ID - both regular and cleanup mode
* add formatted action helpers and replace repeated fmt.Sprintf wrappers
  around actionDone/actionWarn calls

Signed-off-by: Alex Aizman &lt;alex.aizman@gmail.com&gt;
diff --git a/cmd/cli/cli/cluster_hdlr.go b/cmd/cli/cli/cluster_hdlr.go
@@ -645,7 +645,7 @@ func psetForce(c *cli.Context, pid, sname, toURL string) error {
 	if toURL != "" {
 		s = " (at " + toURL + ")"
 	}
-	actionDone(c, fmt.Sprintf("%s%s is now a new primary (set with force)", sname, s))
+	actionDonef(c, "%s%s is now a new primary (set with force)", sname, s)
 	return nil
 }
 
@@ -658,7 +658,13 @@ func startRebHandler(c *cli.Context) (err error) {
 	xargs := xact.ArgsMsg{Kind: apc.ActRebalance}
 
 	cleanup := flagIsSet(c, rebalanceCleanupModeFlag)
-	if cleanup && flagIsSet(c, rebalanceForceFlag) {
+
+	// --force is meaningful only in cleanup mode. Without it, an object whose HRW peer
+	// has a diverged copy (size/checksum/version mismatch) is kept locally; with it,
+	// the local (misplaced) copy is removed.
+	// See reb/cleanup.go (keepDiverged vs removeDiverged).
+
+	if !cleanup && flagIsSet(c, rebalanceForceFlag) {
 		return fmt.Errorf("%s is only valid with %s", qflprn(rebalanceForceFlag), qflprn(rebalanceCleanupModeFlag))
 	}
 	if cleanup {
@@ -739,7 +745,7 @@ func stopReb(c *cli.Context, xid string) error {
 	if err := xstop(&xargs); err != nil {
 		return V(err)
 	}
-	actionDone(c, fmt.Sprintf("Stopped %s[%s]\n", apc.ActRebalance, xid))
+	actionDonef(c, "Stopped %s[%s]\n", apc.ActRebalance, xid)
 	return nil
 }
 
diff --git a/cmd/cli/cli/etl.go b/cmd/cli/cli/etl.go
@@ -844,7 +844,7 @@ func etlObjectHandler(c *cli.Context) error {
 		cos.Close(wfh)
 		if err != nil {
 			if e := cos.RemoveFile(outputDest); e != nil {
-				actionWarn(c, fmt.Sprintf("failed to delete %s: %v", outputDest, e))
+				actionWarnf(c, "failed to delete %s: %v", outputDest, e)
 			}
 		}
 	}
diff --git a/cmd/cli/cli/flag.go b/cmd/cli/cli/flag.go
@@ -186,13 +186,13 @@ func parseRetriesFlag(c *cli.Context, flag cli.IntFlag, warn bool) (retries int)
 	retries = parseIntFlag(c, flag)
 	if retries < 0 {
 		if warn {
-			actionWarn(c, fmt.Sprintf(efmt, flprn(flag), retries))
+			actionWarnf(c, efmt, flprn(flag), retries)
 		}
 		return 0
 	}
 	if retries > maxr {
 		if warn {
-			actionWarn(c, fmt.Sprintf(efmt, flprn(flag), retries))
+			actionWarnf(c, efmt, flprn(flag), retries)
 		}
 		return maxr
 	}
diff --git a/cmd/cli/cli/job_do_hdlr.go b/cmd/cli/cli/job_do_hdlr.go
@@ -473,17 +473,22 @@ func startXaction(c *cli.Context, xargs *xact.ArgsMsg, extra string) error {
 
 	switch xargs.Kind {
 	case apc.ActRebalance:
-		actionDone(c, "Started global rebalance. To monitor the progress, run 'ais show rebalance'")
+		var s string
+		if xargs.Flags&xact.FlagRemoveMisplaced != 0 {
+			s = " (cleanup mode)"
+		}
+		actionDonef(c, "Started rebalance[%s]%s. To monitor the progress, run 'ais show rebalance'", xid, s)
+
 	case apc.ActResilver:
 		const add = " To monitor the progress, run 'ais show job " + apc.ActResilver + "'"
 		var s string
 		if xid != "" {
 			s = "[" + xid + "]"
 		}
 		if xargs.DaemonID != "" {
-			actionDone(c, fmt.Sprintf("Started %s%s on %s."+add, apc.ActResilver, s, meta.Tname(xargs.DaemonID)))
+			actionDonef(c, "Started %s%s on %s."+add, apc.ActResilver, s, meta.Tname(xargs.DaemonID))
 		} else {
-			actionDone(c, fmt.Sprintf("Started %s%s simultaneously on all targets."+add, apc.ActResilver, s))
+			actionDonef(c, "Started %s%s simultaneously on all targets."+add, apc.ActResilver, s)
 		}
 	default:
 		actionX(c, xargs, "")
@@ -792,9 +797,9 @@ func newHFDownloadJobDef(c *cli.Context, req *downloadRequest) (*HFDownloadJobDe
 	}
 
 	if isDataset {
-		actionDone(c, fmt.Sprintf("Found %d parquet files in dataset '%s'", len(files), identifier))
+		actionDonef(c, "Found %d parquet files in dataset '%s'", len(files), identifier)
 	} else {
-		actionDone(c, fmt.Sprintf("Found %d files in model '%s'", len(files), identifier))
+		actionDonef(c, "Found %d files in model '%s'", len(files), identifier)
 	}
 
 	return &HFDownloadJobDef{
@@ -1034,7 +1039,7 @@ func singleJobProgress(c *cli.Context, id string) error {
 func checkJobCompletion(c *cli.Context, jobID string, completed map[string]struct{}) {
 	resp, err := api.DownloadStatus(apiBP, jobID, false /*onlyActive*/)
 	if err != nil {
-		actionWarn(c, fmt.Sprintf("Failed to check status for job %s: %v", jobID, err))
+		actionWarnf(c, "Failed to check status for job %s: %v", jobID, err)
 		return
 	}
 
@@ -1177,7 +1182,7 @@ func stopJobHandler(c *cli.Context) error {
 	if warn != "" {
 		switch {
 		case xid != "":
-			actionWarn(c, fmt.Sprintf("ignoring %s in presence of %s argument ('%s')", warn, jobIDArgument, xid))
+			actionWarnf(c, "ignoring %s in presence of %s argument ('%s')", warn, jobIDArgument, xid)
 		case name == commandRebalance:
 			actionWarn(c, "global rebalance is _global_ - ignoring"+warn)
 		case regex != "" && name != cmdDownload && name != cmdDsort:
@@ -1292,7 +1297,7 @@ func stopJobHandler(c *cli.Context) error {
 	if err := xstop(&args); err != nil {
 		return err
 	}
-	actionDone(c, fmt.Sprintf("Stopped %s\n", msg))
+	actionDonef(c, "Stopped %s\n", msg)
 	return nil
 }
 
@@ -1308,7 +1313,7 @@ func stopXactionKindOrAll(c *cli.Context, xactKind, xname string, bck cmn.Bck) e
 		if xname != "" {
 			what = " '" + xname + "'"
 		}
-		actionDone(c, fmt.Sprintf("No running%s jobs, nothing to do", what))
+		actionDonef(c, "No running%s jobs, nothing to do", what)
 		return nil
 	}
 	for _, cname := range cnames {
@@ -1319,7 +1324,7 @@ func stopXactionKindOrAll(c *cli.Context, xactKind, xname string, bck cmn.Bck) e
 		}
 		args := xact.ArgsMsg{ID: xactID, Kind: xactKind, Bck: bck}
 		if err := xstop(&args); err != nil {
-			actionWarn(c, fmt.Sprintf("failed to stop %s: %v", cname, err))
+			actionWarnf(c, "failed to stop %s: %v", cname, err)
 		} else {
 			actionDone(c, "Stopped "+cname)
 		}
@@ -1357,7 +1362,7 @@ func stopDownloadRegex(c *cli.Context, regex string) error {
 			actionDone(c, "Stopped download job "+dl.ID)
 			cnt++
 		} else {
-			actionWarn(c, fmt.Sprintf("failed to stop download job %q: %v", dl.ID, err))
+			actionWarnf(c, "failed to stop download job %q: %v", dl.ID, err)
 		}
 	}
 	if err != nil {
@@ -1373,7 +1378,7 @@ func stopDownloadHandler(c *cli.Context, id string) (err error) {
 	if err = api.AbortDownload(apiBP, id); err != nil {
 		return
 	}
-	actionDone(c, fmt.Sprintf("Stopped download job %s\n", id))
+	actionDonef(c, "Stopped download job %s\n", id)
 	return
 }
 
@@ -1390,7 +1395,7 @@ func stopDsortRegex(c *cli.Context, regex string) error {
 			actionDone(c, "Stopped dsort job "+dsort.ID)
 			cnt++
 		} else {
-			actionWarn(c, fmt.Sprintf("failed to stop dsort job %q: %v", dsort.ID, err))
+			actionWarnf(c, "failed to stop dsort job %q: %v", dsort.ID, err)
 		}
 	}
 	if err != nil {
@@ -1406,7 +1411,7 @@ func stopDsortHandler(c *cli.Context, id string) (err error) {
 	if err = api.AbortDsort(apiBP, id); err != nil {
 		return
 	}
-	actionDone(c, fmt.Sprintf("Stopped dsort job %s\n", id))
+	actionDonef(c, "Stopped dsort job %s\n", id)
 	return
 }
 
@@ -1428,7 +1433,7 @@ func waitJobHandler(c *cli.Context) error {
 		return missingArgumentsError(c, c.Command.ArgsUsage)
 	}
 	if daemonID != "" {
-		actionWarn(c, fmt.Sprintf("node ID %q will be ignored (waiting for a single target not supported)\n", daemonID))
+		actionWarnf(c, "node ID %q will be ignored (waiting for a single target not supported)\n", daemonID)
 	}
 
 	if name == "" && xid != "" {
@@ -1655,7 +1660,7 @@ func removeDownloadHandler(c *cli.Context) error {
 	if err := api.RemoveDownload(apiBP, id); err != nil {
 		return V(err)
 	}
-	actionDone(c, fmt.Sprintf("Removed finished download job %q", id))
+	actionDonef(c, "Removed finished download job %q", id)
 	return nil
 }
 
@@ -1672,10 +1677,10 @@ func removeDownloadRegex(c *cli.Context, regex string) error {
 		}
 		err = api.RemoveDownload(apiBP, dl.ID)
 		if err == nil {
-			actionDone(c, fmt.Sprintf("Removed download job %q", dl.ID))
+			actionDonef(c, "Removed download job %q", dl.ID)
 			cnt++
 		} else {
-			actionWarn(c, fmt.Sprintf("failed to remove download job %q: %v", dl.ID, err))
+			actionWarnf(c, "failed to remove download job %q: %v", dl.ID, err)
 		}
 	}
 	if err != nil {
@@ -1705,7 +1710,7 @@ func removeDsortHandler(c *cli.Context) error {
 		return V(err)
 	}
 
-	actionDone(c, fmt.Sprintf("Removed finished dsort job %q", id))
+	actionDonef(c, "Removed finished dsort job %q", id)
 	return nil
 }
 
@@ -1722,10 +1727,10 @@ func removeDsortRegex(c *cli.Context, regex string) error {
 		}
 		err = api.RemoveDsort(apiBP, dsort.ID)
 		if err == nil {
-			actionDone(c, fmt.Sprintf("Removed dsort job %q", dsort.ID))
+			actionDonef(c, "Removed dsort job %q", dsort.ID)
 			cnt++
 		} else {
-			actionWarn(c, fmt.Sprintf("failed to remove dsort job %q: %v", dsort.ID, err))
+			actionWarnf(c, "failed to remove dsort job %q: %v", dsort.ID, err)
 		}
 	}
 	if err != nil {
diff --git a/cmd/cli/cli/multiobj.go b/cmd/cli/cli/multiobj.go
@@ -347,7 +347,7 @@ func evictBuckets(c *cli.Context, buckets []cmn.Bck) error {
 	var evicted int
 	for _, bck := range buckets {
 		if err := evictBucket(c, bck); err != nil {
-			actionWarn(c, fmt.Sprintf("failed to evict %s: %v", bck.Cname(""), err))
+			actionWarnf(c, "failed to evict %s: %v", bck.Cname(""), err)
 			continue
 		}
 		evicted++
diff --git a/cmd/cli/cli/multipart.go b/cmd/cli/cli/multipart.go
@@ -150,7 +150,7 @@ func uploadFileInChunks(c *cli.Context, filePath string, fileSize, chunkSize int
 		return err
 	}
 
-	actionDone(c, fmt.Sprintf("PUT in chunks %q => %s\n", filePath, bck.Cname(objName)))
+	actionDonef(c, "PUT in chunks %q => %s\n", filePath, bck.Cname(objName))
 
 	return nil
 }
diff --git a/cmd/cli/cli/multipart_hdlr.go b/cmd/cli/cli/multipart_hdlr.go
@@ -154,8 +154,7 @@ func mptPutHandler(c *cli.Context) error {
 		return fmt.Errorf("failed to upload part %d: %v", partNumber, err)
 	}
 
-	actionDone(c, fmt.Sprintf("Uploaded part %d for %s (upload ID: %s)",
-		partNumber, bck.Cname(objName), uploadID))
+	actionDonef(c, "Uploaded part %d for %s (upload ID: %s)", partNumber, bck.Cname(objName), uploadID)
 	return nil
 }
 
diff --git a/cmd/cli/cli/nbi_hdlr.go b/cmd/cli/cli/nbi_hdlr.go
@@ -155,7 +155,7 @@ func createNBIHandler(c *cli.Context) error {
 		return V(err)
 	}
 
-	actionDone(c, fmt.Sprintf("Creating inventory %s. %s", bck.Cname(""), toMonitorMsg(c, xid, "")))
+	actionDonef(c, "Creating inventory %s. %s", bck.Cname(""), toMonitorMsg(c, xid, ""))
 	return nil
 }
 
@@ -192,7 +192,7 @@ func removeNBIHandler(c *cli.Context) error {
 		return V(err)
 	}
 
-	actionDone(c, fmt.Sprintf("Removed inventory%s for bucket %s", s, bck.String()))
+	actionDonef(c, "Removed inventory%s for bucket %s", s, bck.String())
 	return nil
 }
 
diff --git a/cmd/cli/cli/object.go b/cmd/cli/cli/object.go
@@ -145,7 +145,7 @@ func copyObject(c *cli.Context, bckFrom cmn.Bck, objFrom string, bckTo cmn.Bck,
 		if objTo == "" {
 			objTo = objFrom
 		}
-		actionDone(c, fmt.Sprintf("COPY %s => %s", bckFrom.Cname(objFrom), bckTo.Cname(objTo)))
+		actionDonef(c, "COPY %s => %s", bckFrom.Cname(objFrom), bckTo.Cname(objTo))
 	}
 	return
 }
diff --git a/cmd/cli/cli/object_hdlr.go b/cmd/cli/cli/object_hdlr.go
@@ -559,7 +559,7 @@ func putStdin(c *cli.Context, a *putargs) error {
 	if err := putAppendChunks(c, a.dst.bck, encDstName, os.Stdin, cksum.Type(), chunkSize); err != nil {
 		return err
 	}
-	actionDone(c, fmt.Sprintf("PUT (standard input) => %s\n", a.dst.bck.Cname(a.dst.oname)))
+	actionDonef(c, "PUT (standard input) => %s\n", a.dst.bck.Cname(a.dst.oname))
 	return nil
 }
 
diff --git a/cmd/cli/cli/show_hdlr.go b/cmd/cli/cli/show_hdlr.go
@@ -802,7 +802,7 @@ func showRemoteDashboardHandler(c *cli.Context) error {
 			fmt.Fprint(c.App.Writer, dashStr)
 			fmt.Fprintln(c.App.Writer)
 		} else {
-			actionWarn(c, fmt.Sprintf("Failed to get dashboard for %s: %v", ra.Alias, err))
+			actionWarnf(c, "Failed to get dashboard for %s: %v", ra.Alias, err)
 		}
 	}
 	return nil
diff --git a/cmd/cli/cli/utils.go b/cmd/cli/cli/utils.go
@@ -592,7 +592,7 @@ func fmtBucketCreatedTime(created int64) string {
 func isUnsetTime(c *cli.Context, ts string) bool {
 	t, err := time.Parse(time.RFC822, ts)
 	if err != nil {
-		actionWarn(c, fmt.Sprintf("failed to parse %q using RFC822", ts))
+		actionWarnf(c, "failed to parse %q using RFC822", ts)
 		return false
 	}
 	if t.IsZero() {
@@ -813,8 +813,7 @@ func showSectionNotFoundError(c *cli.Context, section string, config any, helpCm
 		}
 	}
 
-	actionWarn(c, fmt.Sprintf("config section %q not found. %s: %s",
-		section, label, strings.Join(available, ", ")))
+	actionWarnf(c, "config section %q not found. %s: %s", section, label, strings.Join(available, ", "))
 
 	if helpCmd != "" {
 		actionNote(c, helpCmd)
@@ -887,7 +886,7 @@ func printSectionJSON(c *cli.Context, in any, section string) bool {
 	if section == "" {
 		data, err := jsonMarshalIndent(in)
 		if err != nil {
-			actionWarn(c, fmt.Sprintf("failed to marshal config: %v", err))
+			actionWarnf(c, "failed to marshal config: %v", err)
 			return false
 		}
 		fmt.Fprintln(c.App.Writer, string(data))
@@ -955,7 +954,7 @@ func printSectionJSON(c *cli.Context, in any, section string) bool {
 	out := _wrapNestedJSON(section, rootObj)
 	data, err := jsonMarshalIndent(out)
 	if err != nil {
-		actionWarn(c, fmt.Sprintf("failed to marshal section %q: %v", section, err))
+		actionWarnf(c, "failed to marshal section %q: %v", section, err)
 		return false
 	}
 	fmt.Fprintln(c.App.Writer, string(data))
@@ -1056,8 +1055,22 @@ func selectProvidersExclRais(bcks cmn.Bcks) (sorted []string) {
 
 // see related: `verboseWarnings()`
 
+func _fprintlnf(w io.Writer, prefix, format string, a ...any) {
+	fmt.Fprintf(w, prefix+format+"\n", a...)
+}
+
 func actionDone(c *cli.Context, msg string) { fmt.Fprintln(c.App.Writer, msg) }
+
+func actionDonef(c *cli.Context, format string, a ...any) {
+	_fprintlnf(c.App.Writer, "", format, a...)
+}
+
 func actionWarn(c *cli.Context, msg string) { fmt.Fprintln(c.App.ErrWriter, fcyan("Warning: ")+msg) }
+
+func actionWarnf(c *cli.Context, format string, a ...any) {
+	_fprintlnf(c.App.ErrWriter, fcyan("Warning: "), format, a...)
+}
+
 func actionNote(c *cli.Context, msg string) { fmt.Fprintln(c.App.ErrWriter, fblue("Note: ")+msg) }
 
 func actionX(c *cli.Context, xargs *xact.ArgsMsg, s string) {
diff --git a/cmd/cli/cli/verbfobj.go b/cmd/cli/cli/verbfobj.go
@@ -513,7 +513,7 @@ func putRegular(c *cli.Context, bck cmn.Bck, objName, path string, finfo os.File
 		progress.Wait()
 	}
 
-	actionDone(c, fmt.Sprintf("PUT %q => %s\n", path, bck.Cname(objName)))
+	actionDonef(c, "PUT %q => %s\n", path, bck.Cname(objName))
 	return err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ func psetForce(c *cli.Context, pid, sname, toURL string) error {`
`645`	`645`	`if toURL != "" {`
`646`	`646`	`s = " (at " + toURL + ")"`
`647`	`647`	`}`
`648`		`- actionDone(c, fmt.Sprintf("%s%s is now a new primary (set with force)", sname, s))`
	`648`	`+ actionDonef(c, "%s%s is now a new primary (set with force)", sname, s)`
`649`	`649`	`return nil`
`650`	`650`	`}`
`651`	`651`
`@@ -658,7 +658,13 @@ func startRebHandler(c *cli.Context) (err error) {`
`658`	`658`	`xargs := xact.ArgsMsg{Kind: apc.ActRebalance}`
`659`	`659`
`660`	`660`	`cleanup := flagIsSet(c, rebalanceCleanupModeFlag)`
`661`		`- if cleanup && flagIsSet(c, rebalanceForceFlag) {`
	`661`	`+`
	`662`	`+ // --force is meaningful only in cleanup mode. Without it, an object whose HRW peer`
	`663`	`+ // has a diverged copy (size/checksum/version mismatch) is kept locally; with it,`
	`664`	`+ // the local (misplaced) copy is removed.`
	`665`	`+ // See reb/cleanup.go (keepDiverged vs removeDiverged).`
	`666`	`+`
	`667`	`+ if !cleanup && flagIsSet(c, rebalanceForceFlag) {`
`662`	`668`	`return fmt.Errorf("%s is only valid with %s", qflprn(rebalanceForceFlag), qflprn(rebalanceCleanupModeFlag))`
`663`	`669`	`}`
`664`	`670`	`if cleanup {`
`@@ -739,7 +745,7 @@ func stopReb(c *cli.Context, xid string) error {`
`739`	`745`	`if err := xstop(&xargs); err != nil {`
`740`	`746`	`return V(err)`
`741`	`747`	`}`
`742`		`- actionDone(c, fmt.Sprintf("Stopped %s[%s]\n", apc.ActRebalance, xid))`
	`748`	`+ actionDonef(c, "Stopped %s[%s]\n", apc.ActRebalance, xid)`
`743`	`749`	`return nil`
`744`	`750`	`}`
`745`	`751`
Original file line number	Diff line number	Diff line change
`@@ -844,7 +844,7 @@ func etlObjectHandler(c *cli.Context) error {`
`844`	`844`	`cos.Close(wfh)`
`845`	`845`	`if err != nil {`
`846`	`846`	`if e := cos.RemoveFile(outputDest); e != nil {`
`847`		`- actionWarn(c, fmt.Sprintf("failed to delete %s: %v", outputDest, e))`
	`847`	`+ actionWarnf(c, "failed to delete %s: %v", outputDest, e)`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,13 @@ func parseRetriesFlag(c *cli.Context, flag cli.IntFlag, warn bool) (retries int)`
`186`	`186`	`retries = parseIntFlag(c, flag)`
`187`	`187`	`if retries < 0 {`
`188`	`188`	`if warn {`
`189`		`- actionWarn(c, fmt.Sprintf(efmt, flprn(flag), retries))`
	`189`	`+ actionWarnf(c, efmt, flprn(flag), retries)`
`190`	`190`	`}`
`191`	`191`	`return 0`
`192`	`192`	`}`
`193`	`193`	`if retries > maxr {`
`194`	`194`	`if warn {`
`195`		`- actionWarn(c, fmt.Sprintf(efmt, flprn(flag), retries))`
	`195`	`+ actionWarnf(c, efmt, flprn(flag), retries)`
`196`	`196`	`}`
`197`	`197`	`return maxr`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -473,17 +473,22 @@ func startXaction(c cli.Context, xargs xact.ArgsMsg, extra string) error {`
`473`	`473`
`474`	`474`	`switch xargs.Kind {`
`475`	`475`	`case apc.ActRebalance:`
`476`		`- actionDone(c, "Started global rebalance. To monitor the progress, run 'ais show rebalance'")`
	`476`	`+ var s string`
	`477`	`+ if xargs.Flags&xact.FlagRemoveMisplaced != 0 {`
	`478`	`+ s = " (cleanup mode)"`
	`479`	`+ }`
	`480`	`+ actionDonef(c, "Started rebalance[%s]%s. To monitor the progress, run 'ais show rebalance'", xid, s)`
	`481`	`+`
`477`	`482`	`case apc.ActResilver:`
`478`	`483`	`const add = " To monitor the progress, run 'ais show job " + apc.ActResilver + "'"`
`479`	`484`	`var s string`
`480`	`485`	`if xid != "" {`
`481`	`486`	`s = "[" + xid + "]"`
`482`	`487`	`}`
`483`	`488`	`if xargs.DaemonID != "" {`
`484`		`- actionDone(c, fmt.Sprintf("Started %s%s on %s."+add, apc.ActResilver, s, meta.Tname(xargs.DaemonID)))`
	`489`	`+ actionDonef(c, "Started %s%s on %s."+add, apc.ActResilver, s, meta.Tname(xargs.DaemonID))`
`485`	`490`	`} else {`
`486`		`- actionDone(c, fmt.Sprintf("Started %s%s simultaneously on all targets."+add, apc.ActResilver, s))`
	`491`	`+ actionDonef(c, "Started %s%s simultaneously on all targets."+add, apc.ActResilver, s)`
`487`	`492`	`}`
`488`	`493`	`default:`
`489`	`494`	`actionX(c, xargs, "")`
`@@ -792,9 +797,9 @@ func newHFDownloadJobDef(c cli.Context, req downloadRequest) (*HFDownloadJobDe`
`792`	`797`	`}`
`793`	`798`
`794`	`799`	`if isDataset {`
`795`		`- actionDone(c, fmt.Sprintf("Found %d parquet files in dataset '%s'", len(files), identifier))`
	`800`	`+ actionDonef(c, "Found %d parquet files in dataset '%s'", len(files), identifier)`
`796`	`801`	`} else {`
`797`		`- actionDone(c, fmt.Sprintf("Found %d files in model '%s'", len(files), identifier))`
	`802`	`+ actionDonef(c, "Found %d files in model '%s'", len(files), identifier)`
`798`	`803`	`}`
`799`	`804`
`800`	`805`	`return &HFDownloadJobDef{`
`@@ -1034,7 +1039,7 @@ func singleJobProgress(c *cli.Context, id string) error {`
`1034`	`1039`	`func checkJobCompletion(c *cli.Context, jobID string, completed map[string]struct{}) {`
`1035`	`1040`	`resp, err := api.DownloadStatus(apiBP, jobID, false /onlyActive/)`
`1036`	`1041`	`if err != nil {`
`1037`		`- actionWarn(c, fmt.Sprintf("Failed to check status for job %s: %v", jobID, err))`
	`1042`	`+ actionWarnf(c, "Failed to check status for job %s: %v", jobID, err)`
`1038`	`1043`	`return`
`1039`	`1044`	`}`
`1040`	`1045`
`@@ -1177,7 +1182,7 @@ func stopJobHandler(c *cli.Context) error {`
`1177`	`1182`	`if warn != "" {`
`1178`	`1183`	`switch {`
`1179`	`1184`	`case xid != "":`
`1180`		`- actionWarn(c, fmt.Sprintf("ignoring %s in presence of %s argument ('%s')", warn, jobIDArgument, xid))`
	`1185`	`+ actionWarnf(c, "ignoring %s in presence of %s argument ('%s')", warn, jobIDArgument, xid)`
`1181`	`1186`	`case name == commandRebalance:`
`1182`	`1187`	`actionWarn(c, "global rebalance is _global_ - ignoring"+warn)`
`1183`	`1188`	`case regex != "" && name != cmdDownload && name != cmdDsort:`
`@@ -1292,7 +1297,7 @@ func stopJobHandler(c *cli.Context) error {`
`1292`	`1297`	`if err := xstop(&args); err != nil {`
`1293`	`1298`	`return err`
`1294`	`1299`	`}`
`1295`		`- actionDone(c, fmt.Sprintf("Stopped %s\n", msg))`
	`1300`	`+ actionDonef(c, "Stopped %s\n", msg)`
`1296`	`1301`	`return nil`
`1297`	`1302`	`}`
`1298`	`1303`
`@@ -1308,7 +1313,7 @@ func stopXactionKindOrAll(c *cli.Context, xactKind, xname string, bck cmn.Bck) e`
`1308`	`1313`	`if xname != "" {`
`1309`	`1314`	`what = " '" + xname + "'"`
`1310`	`1315`	`}`
`1311`		`- actionDone(c, fmt.Sprintf("No running%s jobs, nothing to do", what))`
	`1316`	`+ actionDonef(c, "No running%s jobs, nothing to do", what)`
`1312`	`1317`	`return nil`
`1313`	`1318`	`}`
`1314`	`1319`	`for _, cname := range cnames {`
`@@ -1319,7 +1324,7 @@ func stopXactionKindOrAll(c *cli.Context, xactKind, xname string, bck cmn.Bck) e`
`1319`	`1324`	`}`
`1320`	`1325`	`args := xact.ArgsMsg{ID: xactID, Kind: xactKind, Bck: bck}`
`1321`	`1326`	`if err := xstop(&args); err != nil {`
`1322`		`- actionWarn(c, fmt.Sprintf("failed to stop %s: %v", cname, err))`
	`1327`	`+ actionWarnf(c, "failed to stop %s: %v", cname, err)`
`1323`	`1328`	`} else {`
`1324`	`1329`	`actionDone(c, "Stopped "+cname)`
`1325`	`1330`	`}`
`@@ -1357,7 +1362,7 @@ func stopDownloadRegex(c *cli.Context, regex string) error {`
`1357`	`1362`	`actionDone(c, "Stopped download job "+dl.ID)`
`1358`	`1363`	`cnt++`
`1359`	`1364`	`} else {`
`1360`		`- actionWarn(c, fmt.Sprintf("failed to stop download job %q: %v", dl.ID, err))`
	`1365`	`+ actionWarnf(c, "failed to stop download job %q: %v", dl.ID, err)`
`1361`	`1366`	`}`
`1362`	`1367`	`}`
`1363`	`1368`	`if err != nil {`
`@@ -1373,7 +1378,7 @@ func stopDownloadHandler(c *cli.Context, id string) (err error) {`
`1373`	`1378`	`if err = api.AbortDownload(apiBP, id); err != nil {`
`1374`	`1379`	`return`
`1375`	`1380`	`}`
`1376`		`- actionDone(c, fmt.Sprintf("Stopped download job %s\n", id))`
	`1381`	`+ actionDonef(c, "Stopped download job %s\n", id)`
`1377`	`1382`	`return`
`1378`	`1383`	`}`
`1379`	`1384`
`@@ -1390,7 +1395,7 @@ func stopDsortRegex(c *cli.Context, regex string) error {`
`1390`	`1395`	`actionDone(c, "Stopped dsort job "+dsort.ID)`
`1391`	`1396`	`cnt++`
`1392`	`1397`	`} else {`
`1393`		`- actionWarn(c, fmt.Sprintf("failed to stop dsort job %q: %v", dsort.ID, err))`
	`1398`	`+ actionWarnf(c, "failed to stop dsort job %q: %v", dsort.ID, err)`
`1394`	`1399`	`}`
`1395`	`1400`	`}`
`1396`	`1401`	`if err != nil {`
`@@ -1406,7 +1411,7 @@ func stopDsortHandler(c *cli.Context, id string) (err error) {`
`1406`	`1411`	`if err = api.AbortDsort(apiBP, id); err != nil {`
`1407`	`1412`	`return`
`1408`	`1413`	`}`
`1409`		`- actionDone(c, fmt.Sprintf("Stopped dsort job %s\n", id))`
	`1414`	`+ actionDonef(c, "Stopped dsort job %s\n", id)`
`1410`	`1415`	`return`
`1411`	`1416`	`}`
`1412`	`1417`
`@@ -1428,7 +1433,7 @@ func waitJobHandler(c *cli.Context) error {`
`1428`	`1433`	`return missingArgumentsError(c, c.Command.ArgsUsage)`
`1429`	`1434`	`}`
`1430`	`1435`	`if daemonID != "" {`
`1431`		`- actionWarn(c, fmt.Sprintf("node ID %q will be ignored (waiting for a single target not supported)\n", daemonID))`
	`1436`	`+ actionWarnf(c, "node ID %q will be ignored (waiting for a single target not supported)\n", daemonID)`
`1432`	`1437`	`}`
`1433`	`1438`
`1434`	`1439`	`if name == "" && xid != "" {`
`@@ -1655,7 +1660,7 @@ func removeDownloadHandler(c *cli.Context) error {`
`1655`	`1660`	`if err := api.RemoveDownload(apiBP, id); err != nil {`
`1656`	`1661`	`return V(err)`
`1657`	`1662`	`}`
`1658`		`- actionDone(c, fmt.Sprintf("Removed finished download job %q", id))`
	`1663`	`+ actionDonef(c, "Removed finished download job %q", id)`
`1659`	`1664`	`return nil`
`1660`	`1665`	`}`
`1661`	`1666`
`@@ -1672,10 +1677,10 @@ func removeDownloadRegex(c *cli.Context, regex string) error {`
`1672`	`1677`	`}`
`1673`	`1678`	`err = api.RemoveDownload(apiBP, dl.ID)`
`1674`	`1679`	`if err == nil {`
`1675`		`- actionDone(c, fmt.Sprintf("Removed download job %q", dl.ID))`
	`1680`	`+ actionDonef(c, "Removed download job %q", dl.ID)`
`1676`	`1681`	`cnt++`
`1677`	`1682`	`} else {`
`1678`		`- actionWarn(c, fmt.Sprintf("failed to remove download job %q: %v", dl.ID, err))`
	`1683`	`+ actionWarnf(c, "failed to remove download job %q: %v", dl.ID, err)`
`1679`	`1684`	`}`
`1680`	`1685`	`}`
`1681`	`1686`	`if err != nil {`
`@@ -1705,7 +1710,7 @@ func removeDsortHandler(c *cli.Context) error {`
`1705`	`1710`	`return V(err)`
`1706`	`1711`	`}`
`1707`	`1712`
`1708`		`- actionDone(c, fmt.Sprintf("Removed finished dsort job %q", id))`
	`1713`	`+ actionDonef(c, "Removed finished dsort job %q", id)`
`1709`	`1714`	`return nil`
`1710`	`1715`	`}`
`1711`	`1716`
`@@ -1722,10 +1727,10 @@ func removeDsortRegex(c *cli.Context, regex string) error {`
`1722`	`1727`	`}`
`1723`	`1728`	`err = api.RemoveDsort(apiBP, dsort.ID)`
`1724`	`1729`	`if err == nil {`
`1725`		`- actionDone(c, fmt.Sprintf("Removed dsort job %q", dsort.ID))`
	`1730`	`+ actionDonef(c, "Removed dsort job %q", dsort.ID)`
`1726`	`1731`	`cnt++`
`1727`	`1732`	`} else {`
`1728`		`- actionWarn(c, fmt.Sprintf("failed to remove dsort job %q: %v", dsort.ID, err))`
	`1733`	`+ actionWarnf(c, "failed to remove dsort job %q: %v", dsort.ID, err)`
`1729`	`1734`	`}`
`1730`	`1735`	`}`
`1731`	`1736`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ func evictBuckets(c *cli.Context, buckets []cmn.Bck) error {`
`347`	`347`	`var evicted int`
`348`	`348`	`for _, bck := range buckets {`
`349`	`349`	`if err := evictBucket(c, bck); err != nil {`
`350`		`- actionWarn(c, fmt.Sprintf("failed to evict %s: %v", bck.Cname(""), err))`
	`350`	`+ actionWarnf(c, "failed to evict %s: %v", bck.Cname(""), err)`
`351`	`351`	`continue`
`352`	`352`	`}`
`353`	`353`	`evicted++`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func uploadFileInChunks(c *cli.Context, filePath string, fileSize, chunkSize int`
`150`	`150`	`return err`
`151`	`151`	`}`
`152`	`152`
`153`		`- actionDone(c, fmt.Sprintf("PUT in chunks %q => %s\n", filePath, bck.Cname(objName)))`
	`153`	`+ actionDonef(c, "PUT in chunks %q => %s\n", filePath, bck.Cname(objName))`
`154`	`154`
`155`	`155`	`return nil`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,7 @@ func mptPutHandler(c *cli.Context) error {`
`154`	`154`	`return fmt.Errorf("failed to upload part %d: %v", partNumber, err)`
`155`	`155`	`}`
`156`	`156`
`157`		`- actionDone(c, fmt.Sprintf("Uploaded part %d for %s (upload ID: %s)",`
`158`		`- partNumber, bck.Cname(objName), uploadID))`
	`157`	`+ actionDonef(c, "Uploaded part %d for %s (upload ID: %s)", partNumber, bck.Cname(objName), uploadID)`
`159`	`158`	`return nil`
`160`	`159`	`}`
`161`	`160`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func createNBIHandler(c *cli.Context) error {`
`155`	`155`	`return V(err)`
`156`	`156`	`}`
`157`	`157`
`158`		`- actionDone(c, fmt.Sprintf("Creating inventory %s. %s", bck.Cname(""), toMonitorMsg(c, xid, "")))`
	`158`	`+ actionDonef(c, "Creating inventory %s. %s", bck.Cname(""), toMonitorMsg(c, xid, ""))`
`159`	`159`	`return nil`
`160`	`160`	`}`
`161`	`161`
`@@ -192,7 +192,7 @@ func removeNBIHandler(c *cli.Context) error {`
`192`	`192`	`return V(err)`
`193`	`193`	`}`
`194`	`194`
`195`		`- actionDone(c, fmt.Sprintf("Removed inventory%s for bucket %s", s, bck.String()))`
	`195`	`+ actionDonef(c, "Removed inventory%s for bucket %s", s, bck.String())`
`196`	`196`	`return nil`
`197`	`197`	`}`
`198`	`198`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func copyObject(c *cli.Context, bckFrom cmn.Bck, objFrom string, bckTo cmn.Bck,`
`145`	`145`	`if objTo == "" {`
`146`	`146`	`objTo = objFrom`
`147`	`147`	`}`
`148`		`- actionDone(c, fmt.Sprintf("COPY %s => %s", bckFrom.Cname(objFrom), bckTo.Cname(objTo)))`
	`148`	`+ actionDonef(c, "COPY %s => %s", bckFrom.Cname(objFrom), bckTo.Cname(objTo))`
`149`	`149`	`}`
`150`	`150`	`return`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ func putStdin(c cli.Context, a putargs) error {`
`559`	`559`	`if err := putAppendChunks(c, a.dst.bck, encDstName, os.Stdin, cksum.Type(), chunkSize); err != nil {`
`560`	`560`	`return err`
`561`	`561`	`}`
`562`		`- actionDone(c, fmt.Sprintf("PUT (standard input) => %s\n", a.dst.bck.Cname(a.dst.oname)))`
	`562`	`+ actionDonef(c, "PUT (standard input) => %s\n", a.dst.bck.Cname(a.dst.oname))`
`563`	`563`	`return nil`
`564`	`564`	`}`
`565`	`565`