Improve(client/status): display statuses even if get status failed for some clients.

Signed-off-by: Wine93 <[email protected]>

Author: Wine93

cli/command/client/status.go

@@ -36,6 +36,7 @@ import (
 
 var (
 	GET_STATUS_PLAYBOOK_STEPS = []int{
+		playbook.INIT_CLIENT_STATUS,
 		playbook.GET_CLIENT_STATUS,
 	}
 )
@@ -81,7 +82,9 @@ func genStatusPlaybook(curveadm *cli.CurveAdm,
 				comm.KEY_CLIENT_STATUS_VERBOSE: options.verbose,
 			},
 			ExecOptions: playbook.ExecOptions{
-				SilentSubBar: true,
+				SilentSubBar:  true,
+				SilentMainBar: step == playbook.INIT_CLIENT_STATUS,
+				SkipError:     true,
 			},
 		})
 	}
@@ -119,11 +122,9 @@ func runStatus(curveadm *cli.CurveAdm, options statusOptions) error {
 	}
 
 	// 3) run playground
-	if err = pb.Run(); err != nil {
-		return err
-	}
+	err = pb.Run()
 
 	// 4) display service status
 	displayStatus(curveadm, clients, options)
-	return nil
+	return err
 }

internal/common/common.go

@@ -84,6 +84,7 @@ const (
 	KEY_MAP_OPTIONS           = "MAP_OPTIONS"
 	KEY_MOUNT_OPTIONS         = "MOUNT_OPTIONS"
 	CLIENT_STATUS_LOSED       = "Losed"
+	CLIENT_STATUS_UNKNOWN     = "Unknown"
 	KERNERL_MODULE_NBD        = "nbd"
 	KERNERL_MODULE_FUSE       = "fuse"
 

internal/playbook/factory.go

@@ -77,6 +77,7 @@ const (
 	COLLECT_CLIENT
 	BACKUP_ETCD_DATA
 	CHECK_MDS_ADDRESS
+	INIT_CLIENT_STATUS
 	GET_CLIENT_STATUS
 	INSTALL_CLIENT
 	UNINSTALL_CLIENT
@@ -224,6 +225,8 @@ func (p *Playbook) createTasks(step *PlaybookStep) (*tasks.Tasks, error) {
 			t, err = comm.NewCollectClientTask(curveadm, config.GetAny(i))
 		case BACKUP_ETCD_DATA:
 			t, err = comm.NewBackupEtcdDataTask(curveadm, config.GetDC(i))
+		case INIT_CLIENT_STATUS:
+			t, err = comm.NewInitClientStatusTask(curveadm, config.GetAny(i))
 		case GET_CLIENT_STATUS:
 			t, err = comm.NewGetClientStatusTask(curveadm, config.GetAny(i))
 		case INSTALL_CLIENT:

internal/task/task/common/client_status.go

@@ -41,12 +41,16 @@ const (
 )
 
 type (
+	step2InitClientStatus struct {
+		client     storage.Client
+		cfgPath    *string
+		memStorage *utils.SafeMap
+	}
+
 	step2FormatClientStatus struct {
-		client      storage.Client
-		containerId string
-		status      *string
-		cfgPath     *string
-		memStorage  *utils.SafeMap
+		client     storage.Client
+		status     *string
+		memStorage *utils.SafeMap
 	}
 
 	ClientStatus struct {
@@ -96,26 +100,60 @@ func setClientStatus(memStorage *utils.SafeMap, id string, status ClientStatus)
 	})
 }
 
-func (s *step2FormatClientStatus) Execute(ctx *context.Context) error {
-	status := *s.status
-	if len(status) == 0 { // container losed
-		status = comm.CLIENT_STATUS_LOSED
-	}
-
+func (s *step2InitClientStatus) Execute(ctx *context.Context) error {
 	client := s.client
 	id := client.Id
 	setClientStatus(s.memStorage, id, ClientStatus{
 		Id:          client.Id,
 		Host:        client.Host,
 		Kind:        client.Kind,
-		ContainerId: s.containerId,
-		Status:      status,
+		ContainerId: client.ContainerId,
+		Status:      comm.CLIENT_STATUS_UNKNOWN,
 		AuxInfo:     client.AuxInfo,
 		CfgPath:     *s.cfgPath,
 	})
 	return nil
 }
 
+func (s *step2FormatClientStatus) Execute(ctx *context.Context) error {
+	status := *s.status
+	if len(status) == 0 { // container losed
+		status = comm.CLIENT_STATUS_LOSED
+	}
+
+	id := s.client.Id
+	s.memStorage.TX(func(kv *utils.SafeMap) error {
+		v := kv.Get(comm.KEY_ALL_CLIENT_STATUS)
+		m := v.(map[string]ClientStatus)
+
+		// update the status
+		s := m[id]
+		s.Status = status
+		m[id] = s
+		kv.Set(comm.KEY_ALL_CLIENT_STATUS, m)
+		return nil
+	})
+	return nil
+}
+
+func NewInitClientStatusTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task, error) {
+	client := v.(storage.Client)
+
+	t := task.NewTask("Init Client Status", "", nil)
+
+	var cfgPath string
+	t.AddStep(&step.Lambda{
+		Lambda: dumpCfg(curveadm, client.Id, &cfgPath),
+	})
+	t.AddStep(&step2InitClientStatus{
+		client:     client,
+		cfgPath:    &cfgPath,
+		memStorage: curveadm.MemStorage(),
+	})
+
+	return t, nil
+}
+
 func NewGetClientStatusTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task, error) {
 	client := v.(storage.Client)
 	hc, err := curveadm.GetHost(client.Host)
@@ -129,23 +167,18 @@ func NewGetClientStatusTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task,
 	t := task.NewTask("Get Client Status", subname, hc.GetSSHConfig())
 
 	// add step
-	var status, cfgPath string
+	var status string
 	t.AddStep(&step.ListContainers{
 		ShowAll:     true,
 		Format:      `"{{.Status}}"`,
 		Filter:      fmt.Sprintf("id=%s", containerId),
 		Out:         &status,
 		ExecOptions: curveadm.ExecOptions(),
 	})
-	t.AddStep(&step.Lambda{
-		Lambda: dumpCfg(curveadm, client.Id, &cfgPath),
-	})
 	t.AddStep(&step2FormatClientStatus{
-		client:      client,
-		containerId: containerId,
-		status:      &status,
-		cfgPath:     &cfgPath,
-		memStorage:  curveadm.MemStorage(),
+		client:     client,
+		status:     &status,
+		memStorage: curveadm.MemStorage(),
 	})
 
 	return t, nil

internal/tui/client/status.go

@@ -33,7 +33,7 @@ import (
 
 func statusDecorate(status string) string {
 	switch status {
-	case comm.CLIENT_STATUS_LOSED:
+	case comm.CLIENT_STATUS_LOSED, comm.CLIENT_STATUS_UNKNOWN:
 		return color.RedString(status)
 	}
 	return status