allow to show versions when display cluster

pingcap · Nov 7, 2023 · 18ce732 · 18ce732
1 parent 8728297
commit 18ce732
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/components/cluster/command/display.go b/components/cluster/command/display.go
@@ -98,6 +98,7 @@ func newDisplayCmd() *cobra.Command {
 	cmd.Flags().BoolVar(&dopt.ShowProcess, "process", false, "display cpu and memory usage of nodes")
 	cmd.Flags().BoolVar(&dopt.ShowManageHost, "manage-host", false, "display manage host of nodes")
 	cmd.Flags().BoolVar(&dopt.ShowNuma, "numa", false, "display numa information of nodes")
+	cmd.Flags().BoolVar(&dopt.ShowVersions, "versions", false, "display component version of instances")
 	cmd.Flags().Uint64Var(&statusTimeout, "status-timeout", 10, "Timeout in seconds when getting node status")
 
 	return cmd

diff --git a/pkg/cluster/manager/display.go b/pkg/cluster/manager/display.go
@@ -51,6 +51,7 @@ type DisplayOption struct {
 	ShowProcess    bool
 	ShowManageHost bool
 	ShowNuma       bool
+	ShowVersions   bool
 }
 
 // InstInfo represents an instance info
@@ -70,6 +71,7 @@ type InstInfo struct {
 	DeployDir   string `json:"deploy_dir"`
 	NumaNode    string `json:"numa_node"`
 	NumaCores   string `json:"numa_cores"`
+	Version     string `json:"version"`
 
 	ComponentName string
 	Port          int
@@ -205,6 +207,9 @@ func (m *Manager) Display(dopt DisplayOption, opt operator.Options) error {
 	if dopt.ShowNuma {
 		rowHead = append(rowHead, "Numa Node", "Numd Cores")
 	}
+	if dopt.ShowVersions {
+		rowHead = append(rowHead, "Version")
+	}
 
 	rowHead = append(rowHead, "Data Dir", "Deploy Dir")
 	clusterTable = append(clusterTable, rowHead)
@@ -235,6 +240,9 @@ func (m *Manager) Display(dopt DisplayOption, opt operator.Options) error {
 		if dopt.ShowNuma {
 			row = append(row, v.NumaNode, v.NumaCores)
 		}
+		if dopt.ShowVersions {
+			row = append(row, v.Version)
+		}
 
 		row = append(row, v.DataDir, v.DeployDir)
 		clusterTable = append(clusterTable, row)
@@ -667,6 +675,7 @@ func (m *Manager) GetClusterTopology(dopt DisplayOption, opt operator.Options) (
 			Since:         since,
 			NumaNode:      utils.Ternary(ins.GetNumaNode() == "", "-", ins.GetNumaNode()).(string),
 			NumaCores:     utils.Ternary(ins.GetNumaCores() == "", "-", ins.GetNumaCores()).(string),
+			Version:       ins.CalculateVersion(base.Version),
 		})
 		mu.Unlock()
 	}, opt.Concurrency)