From 2f9c51349a0f641d3e56686437e733b39201aca0 Mon Sep 17 00:00:00 2001 From: Jason Aten Date: Mon, 5 Oct 2020 19:59:32 -0500 Subject: [PATCH 1/2] correct repair -> analysis in pilosa-fsck logging --- index.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.go b/index.go index f2c045726..56adbd91b 100644 --- a/index.go +++ b/index.go @@ -824,7 +824,7 @@ func (i *Index) ComputeTranslatorSummary(verbose, checkKeys, applyKeyRepairs boo if verbose { // This is pilosa-fsck output, not regular log. - fmt.Printf("# doing repair of keys on nodeID '%v', and primID '%v'\n", nodeID, primID) + fmt.Printf("# doing analysis of keys on nodeID '%v', and primID '%v'\n", nodeID, primID) } changed, err := store.RepairKeys(topo, verbose, applyKeyRepairs) if err != nil { From 6ddeec2ee84afc44ed8f1608e548bd1ae2eb52b0 Mon Sep 17 00:00:00 2001 From: Jason Aten Date: Tue, 6 Oct 2020 08:19:53 -0500 Subject: [PATCH 2/2] print time at end of fsck run, even if we return 1 to shell --- cmd/pilosa-fsck/fsck.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/pilosa-fsck/fsck.go b/cmd/pilosa-fsck/fsck.go index d0a307c92..587485762 100644 --- a/cmd/pilosa-fsck/fsck.go +++ b/cmd/pilosa-fsck/fsck.go @@ -309,10 +309,12 @@ func main() { fixNeeded, err := cfg.Run() if err != nil { + fmt.Fprintf(os.Stdout, "# finished at %v (elapsed %v)\n\n", time.Now().Format(RFC3339MsecTz0), time.Since(t0)) fmt.Fprintf(os.Stderr, "error: %v\n", err) os.Exit(1) } if fixNeeded && !cfg.Fix { + fmt.Fprintf(os.Stdout, "# finished at %v (elapsed %v)\n\n", time.Now().Format(RFC3339MsecTz0), time.Since(t0)) fmt.Fprintf(os.Stderr, "# pilosa-fsck exiting with non-zero error code because a repair is needed, but -fix was not given.\n") os.Exit(1) }