Fix pool.shm (size in mi), store multiple keys removal, new volume resource kw volatile, improve drbd provision

core/commoncmd/flags.go

@@ -190,6 +190,10 @@ func FlagKey(flags *pflag.FlagSet, p *string) {
 	flags.StringVar(p, "key", "", "a data key name")
 }
 
+func FlagKeys(flags *pflag.FlagSet, p *[]string) {
+	flags.StringSliceVar(p, "key", nil, "a data key name")
+}
+
 func FlagKeyTo(flags *pflag.FlagSet, p *string) {
 	flags.StringVar(p, "to", "", "the new data key name")
 }
@@ -382,6 +386,10 @@ func FlagKeyName(flags *pflag.FlagSet, p *string) {
 	flags.StringVar(p, "name", "", "the key name")
 }
 
+func FlagKeyNames(flags *pflag.FlagSet, p *[]string) {
+	flags.StringSliceVar(p, "name", nil, "a data key name")
+}
+
 func FlagKeyValue(flags *pflag.FlagSet, p *string) {
 	flags.StringVar(p, "value", "", "the key value")
 }

core/om/factory.go

@@ -401,7 +401,7 @@ func newCmdObjectKeyRemove(kind string) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	addFlagsGlobal(flags, &options.OptsGlobal)
-	commoncmd.FlagKeyName(flags, &options.Name)
+	commoncmd.FlagKeyNames(flags, &options.Names)
 	return cmd
 }
 
@@ -3536,7 +3536,7 @@ func newCmdDataStoreRemove(kind string) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	addFlagsGlobal(flags, &options.OptsGlobal)
-	commoncmd.FlagKey(flags, &options.Name)
+	commoncmd.FlagKeys(flags, &options.Names)
 	return cmd
 }
 

core/omcmd/object_key_remove.go

@@ -12,7 +12,7 @@ import (
 type (
 	CmdObjectKeyRemove struct {
 		OptsGlobal
-		Name string
+		Names []string
 	}
 )
 
@@ -27,7 +27,12 @@ func (t *CmdObjectKeyRemove) Run(kind string) error {
 			if err != nil {
 				return nil, err
 			}
-			return nil, store.RemoveKey(t.Name)
+			for _, name := range t.Names {
+				if err := store.TransactionRemoveKey(name); err != nil {
+					return nil, err
+				}
+			}
+			return nil, store.Config().CommitInvalid()
 		}),
 	).Do()
 }

core/ox/factory.go

@@ -305,7 +305,7 @@ func newCmdObjectKeyRemove(kind string) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	addFlagsGlobal(flags, &options.OptsGlobal)
-	commoncmd.FlagKeyName(flags, &options.Name)
+	commoncmd.FlagKeyNames(flags, &options.Names)
 	return cmd
 }
 
@@ -3289,7 +3289,7 @@ func newCmdDataStoreRemove(kind string) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	addFlagsGlobal(flags, &options.OptsGlobal)
-	commoncmd.FlagKey(flags, &options.Name)
+	commoncmd.FlagKeys(flags, &options.Names)
 	return cmd
 }
 

core/oxcmd/object_key_remove.go

@@ -1,7 +1,9 @@
 package oxcmd
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"slices"
@@ -16,7 +18,7 @@ import (
 type (
 	CmdObjectKeyRemove struct {
 		OptsGlobal
-		Name string
+		Names []string
 	}
 )
 
@@ -46,10 +48,18 @@ func (t *CmdObjectKeyRemove) Run(kind string) error {
 }
 
 func (t *CmdObjectKeyRemove) RunForPath(ctx context.Context, c *client.T, path naming.Path) error {
-	params := api.DeleteObjectDataKeyParams{
-		Name: t.Name,
+	data := make(api.PatchDataKeys, len(t.Names))
+	for i, name := range t.Names {
+		data[i] = api.PatchDataKey{
+			Action: "remove",
+			Name:   name,
+		}
+	}
+	r := bytes.NewBuffer(nil)
+	if err := json.NewEncoder(r).Encode(data); err != nil {
+		return err
 	}
-	response, err := c.DeleteObjectDataKeyWithResponse(ctx, path.Namespace, path.Kind, path.Name, &params)
+	response, err := c.PatchObjectDataWithBodyWithResponse(ctx, path.Namespace, path.Kind, path.Name, "application/json", r)
 	if err != nil {
 		return err
 	}

core/pool/lookup.go

@@ -17,14 +17,15 @@ type (
 		Pools() []Pooler
 	}
 	Lookup struct {
-		Name   string
-		Type   string
-		Access volaccess.T
-		Size   int64
-		Format bool
-		Shared bool
-		Usage  bool
-		Nodes  []string
+		Name     string
+		Type     string
+		Access   volaccess.T
+		Size     int64
+		Format   bool
+		Shared   bool
+		Usage    bool
+		Volatile bool
+		Nodes    []string
 
 		manager manager
 	}
@@ -36,6 +37,19 @@ type (
 	}
 )
 
+const (
+	CapBlk      Capability = "blk"
+	CapFile     Capability = "file"
+	CapMove     Capability = "move"
+	CapROO      Capability = "roo"
+	CapROX      Capability = "rox"
+	CapRWO      Capability = "rwo"
+	CapRWX      Capability = "rwx"
+	CapShared   Capability = "shared"
+	CapSnap     Capability = "snap"
+	CapVolatile Capability = "volatile"
+)
+
 func (by By) Sort(l StatusList) {
 	s := &statusSorter{
 		data: l,
@@ -72,10 +86,6 @@ func (t Lookup) Do(ctx context.Context) (Pooler, error) {
 			cause = append(cause, fmt.Sprintf("[%s] not matching name %s", p.Name(), t.Name))
 			continue
 		}
-		if t.Type == "" && "shm" == p.Type() {
-			cause = append(cause, fmt.Sprintf("[%s] volatile, type not requested, assume persistence is expected.", p.Name()))
-			continue
-		}
 		if t.Type != "" && t.Type != p.Type() {
 			cause = append(cause, fmt.Sprintf("[%s] type %s not matching %s", p.Name(), p.Type(), t.Type))
 			continue
@@ -84,14 +94,26 @@ func (t Lookup) Do(ctx context.Context) (Pooler, error) {
 			cause = append(cause, fmt.Sprintf("[%s] not %s capable %s", p.Name(), t.Access, p.Capabilities()))
 			continue
 		}
-		if t.Format == false && !HasCapability(p, "blk") {
+		if t.Format == false && !HasCapability(p, CapBlk) {
 			cause = append(cause, fmt.Sprintf("[%s] not blk capable", p.Name()))
 			continue
 		}
-		if t.Shared == true && !HasCapability(p, "shared") {
+		if t.Format == true && !HasCapability(p, CapFile) {
+			cause = append(cause, fmt.Sprintf("[%s] not file capable", p.Name()))
+			continue
+		}
+		if t.Shared == true && !HasCapability(p, CapShared) {
 			cause = append(cause, fmt.Sprintf("[%s] not shared capable", p.Name()))
 			continue
 		}
+		if t.Volatile == true && !HasCapability(p, CapVolatile) {
+			cause = append(cause, fmt.Sprintf("[%s] not volatile capable", p.Name()))
+			continue
+		}
+		if t.Volatile == false && HasCapability(p, CapVolatile) {
+			cause = append(cause, fmt.Sprintf("[%s] not persistent capable", p.Name()))
+			continue
+		}
 		if t.Usage == true {
 			usage, err := p.Usage(ctx)
 			if err != nil {
@@ -112,19 +134,19 @@ func (t Lookup) Do(ctx context.Context) (Pooler, error) {
 	}
 	weight := func(p1, p2 *StatusItem) bool {
 		if !t.Shared {
-			p1shared := p1.HasCapability("shared")
-			p2shared := p2.HasCapability("shared")
+			p1shared := p1.HasCapability(CapShared)
+			p2shared := p2.HasCapability(CapShared)
 			switch {
 			case p1shared && p2shared:
 				// not decisive
 			case !p1shared && !p2shared:
 				// not decisive
 			case p1shared && !p2shared:
 				// prefer p2, not shared-capable
-				return true
+				return false
 			case !p1shared && p2shared:
 				// prefer p1, not shared-capable
-				return false
+				return true
 			}
 		}
 		if p1.Usage.Free < p2.Usage.Free {

core/pool/main.go

@@ -39,20 +39,21 @@ type (
 
 	Status struct {
 		Usage
-		Capabilities []string  `json:"capabilities"`
-		Errors       []string  `json:"errors"`
-		Head         string    `json:"head"`
-		Type         string    `json:"type"`
-		UpdatedAt    time.Time `json:"updated_at"`
-		VolumeCount  int       `json:"volume_count"`
+		Capabilities Capabilities `json:"capabilities"`
+		Errors       []string     `json:"errors"`
+		Head         string       `json:"head"`
+		Type         string       `json:"type"`
+		UpdatedAt    time.Time    `json:"updated_at"`
+		VolumeCount  int          `json:"volume_count"`
 	}
 	StatusItem struct {
 		Status
 		Name string `json:"name"`
 	}
 
 	StatusList   []StatusItem
-	Capabilities []string
+	Capabilities []Capability
+	Capability   string
 
 	VolumeStatus struct {
 		Pool     string       `json:"pool"`
@@ -85,7 +86,7 @@ type (
 		Type() string
 		Head() string
 		Mappings() map[string]string
-		Capabilities() []string
+		Capabilities() Capabilities
 		Usage(context.Context) (Usage, error)
 		SetConfig(Config)
 		Config() Config
@@ -120,6 +121,18 @@ type (
 	}
 )
 
+func (t Capabilities) StringSlice() []string {
+	l := make([]string, len(t))
+	for i, c := range t {
+		l[i] = string(c)
+	}
+	return l
+}
+
+func (t Capabilities) String() string {
+	return strings.Join(t.StringSlice(), ",")
+}
+
 func MappingsFromPaths(paths san.Paths) (array.Mappings, error) {
 	m := make(array.Mappings)
 	for _, path := range paths.MappingList() {
@@ -458,10 +471,10 @@ func (t VolumeStatusList) Swap(i, j int) {
 }
 
 func HasAccess(p Pooler, acs volaccess.T) bool {
-	return HasCapability(p, acs.String())
+	return HasCapability(p, Capability(acs.String()))
 }
 
-func HasCapability(p Pooler, s string) bool {
+func HasCapability(p Pooler, s Capability) bool {
 	for _, capa := range p.Capabilities() {
 		if capa == s {
 			return true
@@ -472,10 +485,10 @@ func HasCapability(p Pooler, s string) bool {
 }
 
 func (t *Status) HasAccess(acs volaccess.T) bool {
-	return t.HasCapability(acs.String())
+	return t.HasCapability(Capability(acs.String()))
 }
 
-func (t *Status) HasCapability(s string) bool {
+func (t *Status) HasCapability(s Capability) bool {
 	for _, capa := range t.Capabilities {
 		if capa == s {
 			return true
@@ -490,7 +503,7 @@ func (t *Status) DeepCopy() *Status {
 		Type:         t.Type,
 		Head:         t.Head,
 		VolumeCount:  t.VolumeCount,
-		Capabilities: append([]string{}, t.Capabilities...),
+		Capabilities: append(Capabilities{}, t.Capabilities...),
 		UpdatedAt:    t.UpdatedAt,
 		Usage: Usage{
 			Free: t.Usage.Free,

core/tui/pool.go

@@ -91,7 +91,7 @@ func (t *App) updatePoolList(forceUpdate bool) {
 		return []string{
 			poolName,
 			poolData.Type,
-			strings.Join(poolData.Capabilities, ","),
+			poolData.Capabilities.String(),
 			poolData.Head,
 			strconv.FormatInt(int64(poolData.VolumeCount), 10),
 			sizeconv.BSizeCompact(float64(poolData.Size)),

daemon/daemonapi/get_pool.go

@@ -59,8 +59,12 @@ func (a *DaemonAPI) getNodePools(ctx echo.Context, name *string, nodeMap nodesel
 			continue
 		}
 		stat := *e.Value
+		capabilities := make([]string, len(stat.Capabilities))
+		for i, c := range stat.Capabilities {
+			capabilities[i] = string(c)
+		}
 		item := api.Pool{
-			Capabilities: append([]string{}, stat.Capabilities...),
+			Capabilities: capabilities,
 			Free:         stat.Free,
 			Head:         stat.Head,
 			Name:         e.Name,
@@ -89,9 +93,13 @@ func (a *DaemonAPI) getClusterPools(ctx echo.Context, name *string) api.PoolItem
 		}
 		item, ok := m[e.Name]
 		stat := *e.Value
+		capabilities := make([]string, len(stat.Capabilities))
+		for i, c := range stat.Capabilities {
+			capabilities[i] = string(c)
+		}
 		if !ok {
 			item = api.Pool{
-				Capabilities: append([]string{}, stat.Capabilities...),
+				Capabilities: capabilities,
 				Free:         stat.Free,
 				Head:         stat.Head,
 				Name:         e.Name,

drivers/pooldirectory/main.go

@@ -40,8 +40,15 @@ func (t T) Head() string {
 	return t.path()
 }
 
-func (t T) Capabilities() []string {
-	return []string{"rox", "rwx", "roo", "rwo", "blk"}
+func (t T) Capabilities() pool.Capabilities {
+	return pool.Capabilities{
+		pool.CapBlk,
+		pool.CapFile,
+		pool.CapROO,
+		pool.CapROX,
+		pool.CapRWO,
+		pool.CapRWX,
+	}
 }
 
 func (t T) Usage(ctx context.Context) (pool.Usage, error) {

drivers/pooldrbd/main.go

@@ -42,8 +42,18 @@ func New() *T {
 	return &t
 }
 
-func (t T) Capabilities() []string {
-	return []string{"rox", "rwx", "roo", "rwo", "snap", "blk", "shared"}
+func (t T) Capabilities() pool.Capabilities {
+	return pool.Capabilities{
+		pool.CapBlk,
+		pool.CapFile,
+		pool.CapMove,
+		pool.CapROO,
+		pool.CapROX,
+		pool.CapRWO,
+		pool.CapRWX,
+		pool.CapShared,
+		pool.CapSnap,
+	}
 }
 
 func (t T) vg() string {