cmd: append node name to service status

We can show which node a target is running on.
LINBIT · Mar 23, 2023 · 106dfc8 · 106dfc8
1 parent 9323f31
commit 106dfc8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/cmd/iscsi.go b/cmd/iscsi.go
@@ -161,8 +161,12 @@ about the existing drbd-reactor and linstor parts.`,
 						continue
 					}
 
+					serviceStatus := cfg.Status.Service.String()
+					if cfg.Status.Service == common.ServiceStateStarted && cfg.Status.Primary != "" {
+						serviceStatus += " (" + cfg.Status.Primary + ")"
+					}
 					table.Rich(
-						[]string{cfg.IQN.String(), strings.Join(serviceIpStrings, ", "), cfg.Status.Service.String(), strconv.Itoa(vol.Number), vol.State.String()},
+						[]string{cfg.IQN.String(), strings.Join(serviceIpStrings, ", "), serviceStatus, strconv.Itoa(vol.Number), vol.State.String()},
 						[]tablewriter.Colors{{}, {}, ServiceStateColor(cfg.Status.Service), {}, ResourceStateColor(vol.State)},
 					)
 					if vol.State != common.ResourceStateOK {

diff --git a/cmd/nfs.go b/cmd/nfs.go
@@ -174,10 +174,14 @@ overview about the existing LINSTOR resources and service status.`,
 
 					log.Debugf("listing volume: %+v", vol)
 
+					serviceStatus := resource.Status.Service.String()
+					if resource.Status.Service == common.ServiceStateStarted && resource.Status.Primary != "" {
+						serviceStatus += " (" + resource.Status.Primary + ")"
+					}
 					table.Rich([]string{
 						resource.Name,
 						resource.ServiceIP.String(),
-						resource.Status.Service.String(),
+						serviceStatus,
 						nfs.ExportPath(resource, &vol),
 						withStatus.Status.State.String(),
 					}, []tablewriter.Colors{

diff --git a/cmd/nvme.go b/cmd/nvme.go
@@ -65,8 +65,12 @@ func listNVMECommand() *cobra.Command {
 						log.Debugf("not displaying cluster private volume: %+v", vol)
 						continue
 					}
+					serviceStatus := cfg.Status.Service.String()
+					if cfg.Status.Service == common.ServiceStateStarted && cfg.Status.Primary != "" {
+						serviceStatus += " (" + cfg.Status.Primary + ")"
+					}
 					table.Rich(
-						[]string{cfg.NQN.String(), cfg.ServiceIP.String(), cfg.Status.Service.String(), strconv.Itoa(vol.Number), vol.State.String()},
+						[]string{cfg.NQN.String(), cfg.ServiceIP.String(), serviceStatus, strconv.Itoa(vol.Number), vol.State.String()},
 						[]tablewriter.Colors{{}, {}, ServiceStateColor(cfg.Status.Service), {}, ResourceStateColor(vol.State)},
 					)
 					if vol.State != common.ResourceStateOK {