From 170311ce6cbc7adc9864f75d0cb77ccddff0e5c6 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Fri, 25 Jan 2019 12:52:54 +0800 Subject: [PATCH] refine binlogctl's output (#149) (#189) --- tidb-binlog/binlogctl/config.go | 2 +- tidb-binlog/binlogctl/nodes.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tidb-binlog/binlogctl/config.go b/tidb-binlog/binlogctl/config.go index d6639073b..45899cd18 100644 --- a/tidb-binlog/binlogctl/config.go +++ b/tidb-binlog/binlogctl/config.go @@ -62,7 +62,7 @@ func NewConfig() *Config { cfg.FlagSet = flag.NewFlagSet("binlogctl", flag.ContinueOnError) cfg.FlagSet.StringVar(&cfg.Command, "cmd", "pumps", "operator: \"generate_meta\", \"pumps\", \"drainers\", \"update-pump\", \"update-drainer\", \"pause-pump\", \"pause-drainer\", \"offline-pump\", \"offline-drainer\"") - cfg.FlagSet.StringVar(&cfg.NodeID, "node-id", "", "id of node, use to delete some node with operation delete-pump and delete-drainer") + cfg.FlagSet.StringVar(&cfg.NodeID, "node-id", "", "id of node, use to update some node with operation update-pump, update-drainer, pause-pump, pause-drainer, offline-pump and offline-drainer") cfg.FlagSet.StringVar(&cfg.DataDir, "data-dir", defaultDataDir, "meta directory path") cfg.FlagSet.StringVar(&cfg.EtcdURLs, "pd-urls", defaultEtcdURLs, "a comma separated list of PD endpoints") cfg.FlagSet.StringVar(&cfg.SSLCA, "ssl-ca", "", "Path of file that contains list of trusted SSL CAs for connection with cluster components.") diff --git a/tidb-binlog/binlogctl/nodes.go b/tidb-binlog/binlogctl/nodes.go index d19c41f83..fca4fe8fa 100644 --- a/tidb-binlog/binlogctl/nodes.go +++ b/tidb-binlog/binlogctl/nodes.go @@ -43,7 +43,7 @@ func queryNodesByKind(urls string, kind string) error { } for _, n := range nodes { - log.Infof("%s: %+v", kind, n) + log.Infof("%s: %s", kind, formatNodeInfo(n)) } return nil @@ -129,3 +129,8 @@ func applyAction(urls, kind, nodeID string, action string) error { return errors.NotFoundf("nodeID %s", nodeID) } + +func formatNodeInfo(status *node.Status) string { + updateTime := utils.TSOToRoughTime(status.UpdateTS) + return fmt.Sprintf("{NodeID: %s, Addr: %s, State: %s, MaxCommitTS: %d, UpdateTime: %v}", status.NodeID, status.Addr, status.State, status.MaxCommitTS, updateTime) +}