Improve(client/status): added poolset aux info for curvebs volume.

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

Author: Wine93

cli/command/client/map.go

@@ -161,7 +161,7 @@ func NewMapCommand(curveadm *cli.CurveAdm) *cobra.Command {
 	flags.BoolVar(&options.noExclusive, "no-exclusive", false, "Map volume non exclusive")
 	flags.StringVar(&options.size, "size", "10GiB", "Specify volume size")
 	flags.StringVarP(&options.filename, "conf", "c", "client.yaml", "Specify client configuration file")
-	flags.StringVar(&options.poolset, "poolset", "", "Specify the poolset name")
+	flags.StringVar(&options.poolset, "poolset", "default", "Specify the poolset name")
 	return cmd
 }
 

internal/errno/errno.go

@@ -215,6 +215,7 @@ var (
 	ERR_GET_CLIENT_BY_ID_FAILED        = EC(113002, "execute SQL failed which get client by id")
 	ERR_GET_ALL_CLIENTS_FAILED         = EC(113003, "execute SQL failed which get all clients")
 	ERR_DELETE_CLIENT_FAILED           = EC(113004, "execute SQL failed which delete client")
+	ERR_SET_CLIENT_AUX_INFO_FAILED     = EC(113005, "execute SQL failed which set client aux info")
 	// 114: database/SQL (execute SQL statement: playground table)
 	ERR_INSERT_PLAYGROUND_FAILED      = EC(114000, "execute SQL failed which insert playground")
 	ERR_GET_ALL_PLAYGROUND_FAILED     = EC(114001, "execute SQL failed which get all playgrounds")

internal/storage/sql.go

@@ -205,6 +205,9 @@ var (
 	// insert client
 	InsertClient = `INSERT INTO clients(id, kind, host, container_id, aux_info) VALUES(?, ?, ?, ?, ?)`
 
+	// set client aux info
+	SetClientAuxInfo = `UPDATE clients SET aux_info = ? WHERE id = ?`
+
 	// select clients
 	SelectClients = `SELECT * FROM clients`
 

internal/storage/storage.go

@@ -265,6 +265,10 @@ func (s *Storage) InsertClient(id, kind, host, containerId, auxInfo string) erro
 	return s.write(InsertClient, id, kind, host, containerId, auxInfo)
 }
 
+func (s *Storage) SetClientAuxInfo(id, auxInfo string) error {
+	return s.write(SetClientAuxInfo, id, auxInfo)
+}
+
 func (s *Storage) getClients(query string, args ...interface{}) ([]Client, error) {
 	result, err := s.db.Query(query, args...)
 	if err != nil {

internal/task/task/bs/create_volume.go

@@ -23,6 +23,7 @@
 package bs
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -75,6 +76,28 @@ func checkCreateStatus(out *string) step.LambdaType {
 	}
 }
 
+func setClientAuxInfo(curveadm *cli.CurveAdm, options MapOptions) step.LambdaType {
+	return func(ctx *context.Context) error {
+		volumeId := curveadm.GetVolumeId(options.Host, options.User, options.Volume)
+
+		auxInfo := &AuxInfo{
+			User:    options.User,
+			Volume:  options.Volume,
+			Poolset: options.Poolset,
+		}
+		bytes, err := json.Marshal(auxInfo)
+		if err != nil {
+			return errno.ERR_ENCODE_VOLUME_INFO_TO_JSON_FAILED.E(err)
+		}
+
+		err = curveadm.Storage().SetClientAuxInfo(volumeId, string(bytes))
+		if err != nil {
+			return errno.ERR_SET_CLIENT_AUX_INFO_FAILED.E(err)
+		}
+		return nil
+	}
+}
+
 func NewCreateVolumeTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*task.Task, error) {
 	options := curveadm.MemStorage().Get(comm.KEY_MAP_OPTIONS).(MapOptions)
 	hc, err := curveadm.GetHost(options.Host)
@@ -127,6 +150,9 @@ func NewCreateVolumeTask(curveadm *cli.CurveAdm, cc *configure.ClientConfig) (*t
 	t.AddStep(&step.Lambda{
 		Lambda: checkCreateStatus(&out),
 	})
+	t.AddStep(&step.Lambda{
+		Lambda: setClientAuxInfo(curveadm, options),
+	})
 
 	return t, nil
 }

internal/task/task/bs/start_nebd.go

@@ -51,9 +51,10 @@ type (
 	}
 
 	AuxInfo struct {
-		User   string `json:"user"`
-		Volume string `json:"volume,"`
-		Config string `json:"config,omitempty"` // TODO(P1)
+		User    string `json:"user"`
+		Volume  string `json:"volume"`
+		Poolset string `json:"poolset"`
+		Config  string `json:"config,omitempty"` // TODO(P1)
 	}
 )
 
@@ -122,8 +123,9 @@ func (s *step2InsertClient) Execute(ctx *context.Context) error {
 	volumeId := curveadm.GetVolumeId(options.Host, options.User, options.Volume)
 
 	auxInfo := &AuxInfo{
-		User:   options.User,
-		Volume: options.Volume,
+		User:    options.User,
+		Volume:  options.Volume,
+		Poolset: options.Poolset,
 	}
 	bytes, err := json.Marshal(auxInfo)
 	if err != nil {