Refactor Device management

Signed-off-by: Aravinda VK <avishwan@redhat.com>

e2e/smartvol_ops_test.go

@@ -35,7 +35,7 @@ func checkZeroLvs(r *require.Assertions) {
 
 func checkZeroLvsWithRange(r *require.Assertions, start, end int) {
 	for i := start; i <= end; i++ {
-		nlv, err := numberOfLvs(fmt.Sprintf("vg-dev-gluster_loop%d", i))
+		nlv, err := numberOfLvs(fmt.Sprintf("gluster-dev-gluster_loop%d", i))
 		r.Nil(err)
 		if err == nil {
 			r.Equal(0, nlv)
@@ -325,7 +325,7 @@ func editDevice(t *testing.T) {
 	var deviceList []deviceapi.Info
 	var peerID string
 	for _, peer := range peerList {
-		deviceList, err = client.DeviceList(peer.ID.String())
+		deviceList, err = client.DeviceList(peer.ID.String(), "")
 		if len(deviceList) > 0 {
 			peerID = peer.ID.String()
 			break
@@ -334,26 +334,26 @@ func editDevice(t *testing.T) {
 
 	device := deviceList[0]
 	if device.State == "enabled" {
-		err = client.DeviceEdit(peerID, device.Name, "disabled")
+		err = client.DeviceEdit(peerID, device.Device, "disabled")
 		r.Nil(err)
 	} else if device.State == "disabled" {
-		err = client.DeviceEdit(peerID, device.Name, "enabled")
+		err = client.DeviceEdit(peerID, device.Device, "enabled")
 		r.Nil(err)
 	}
-	newDeviceList, err := client.DeviceList(peerID)
+	newDeviceList, err := client.DeviceList(peerID, "")
 	r.Nil(err)
 	for _, newDevice := range newDeviceList {
-		if newDevice.Name == device.Name {
+		if newDevice.Device == device.Device {
 			r.NotEqual(newDevice.State, device.State)
 		}
 	}
 
 	for _, peer := range peerList {
-		deviceList, err := client.DeviceList(peer.ID.String())
+		deviceList, err := client.DeviceList(peer.ID.String(), "")
 		r.Nil(err)
 		for _, device := range deviceList {
 			if device.State == "enabled" {
-				err = client.DeviceEdit(peer.ID.String(), device.Name, "disabled")
+				err = client.DeviceEdit(peer.ID.String(), device.Device, "disabled")
 				r.Nil(err)
 			}
 		}
@@ -372,11 +372,11 @@ func editDevice(t *testing.T) {
 	r.NotNil(err)
 
 	for _, peer := range peerList {
-		deviceList, err := client.DeviceList(peer.ID.String())
+		deviceList, err := client.DeviceList(peer.ID.String(), "")
 		r.Nil(err)
 		for _, device := range deviceList {
 			if device.State == "disabled" {
-				err = client.DeviceEdit(peer.ID.String(), device.Name, "enabled")
+				err = client.DeviceEdit(peer.ID.String(), device.Device, "enabled")
 				r.Nil(err)
 			}
 		}
@@ -413,12 +413,21 @@ func TestSmartVolume(t *testing.T) {
 
 	_, err = client.DeviceAdd(tc.gds[0].PeerID(), "/dev/gluster_loop1")
 	r.Nil(err)
+	dev, err := client.DeviceList(tc.gds[0].PeerID(), "/dev/gluster_loop1")
+	r.Nil(err)
+	r.Equal(dev[0].Device, "/dev/gluster_loop1")
 
 	_, err = client.DeviceAdd(tc.gds[1].PeerID(), "/dev/gluster_loop2")
 	r.Nil(err)
+	dev, err = client.DeviceList(tc.gds[1].PeerID(), "/dev/gluster_loop2")
+	r.Nil(err)
+	r.Equal(dev[0].Device, "/dev/gluster_loop2")
 
 	_, err = client.DeviceAdd(tc.gds[2].PeerID(), "/dev/gluster_loop3")
 	r.Nil(err)
+	dev, err = client.DeviceList(tc.gds[2].PeerID(), "/dev/gluster_loop3")
+	r.Nil(err)
+	r.Equal(dev[0].Device, "/dev/gluster_loop3")
 
 	t.Run("Smartvol Distributed Volume", testSmartVolumeDistribute)
 	t.Run("Smartvol Replicate 2 Volume", testSmartVolumeReplicate2)

glusterd2/brick/types.go

@@ -44,6 +44,8 @@ type Brickinfo struct {
 	Type           Type
 	Decommissioned bool
 	PType          ProvisionType
+	VgName         string
+	RootDevice     string
 	MountInfo
 }
 

glusterd2/bricksplanner/planner.go

@@ -183,6 +183,7 @@ func PlanBricks(req *api.VolCreateReq) error {
 				if vg.AvailableSize >= totalsize && !zoneUsed && !vg.Used {
 					subvols[idx].Bricks[bidx].PeerID = vg.PeerID
 					subvols[idx].Bricks[bidx].VgName = vg.Name
+					subvols[idx].Bricks[bidx].RootDevice = vg.Device
 					subvols[idx].Bricks[bidx].DevicePath = "/dev/" + vg.Name + "/" + b.LvName
 
 					zones[vg.Zone] = struct{}{}
@@ -211,6 +212,7 @@ func PlanBricks(req *api.VolCreateReq) error {
 				if vg.AvailableSize >= totalsize && !zoneUsed {
 					subvols[idx].Bricks[bidx].PeerID = vg.PeerID
 					subvols[idx].Bricks[bidx].VgName = vg.Name
+					subvols[idx].Bricks[bidx].RootDevice = vg.Device
 					subvols[idx].Bricks[bidx].DevicePath = "/dev/" + vg.Name + "/" + b.LvName
 
 					zones[vg.Zone] = struct{}{}

glusterd2/bricksplanner/utils.go

@@ -1,7 +1,6 @@
 package bricksplanner
 
 import (
-	"encoding/json"
 	"sort"
 	"strings"
 
@@ -10,6 +9,7 @@ import (
 	"github.com/gluster/glusterd2/pkg/api"
 	"github.com/gluster/glusterd2/pkg/utils"
 	deviceapi "github.com/gluster/glusterd2/plugins/device/api"
+	"github.com/gluster/glusterd2/plugins/device/deviceutils"
 )
 
 var subvolPlanners = make(map[string]SubvolPlanner)
@@ -25,7 +25,7 @@ type SubvolPlanner interface {
 // Vg represents Virtual Volume Group
 type Vg struct {
 	Name          string
-	DeviceName    string
+	Device        string
 	PeerID        string
 	Zone          string
 	State         string
@@ -71,15 +71,14 @@ func getAvailableVgs(req *api.VolCreateReq) ([]Vg, error) {
 			continue
 		}
 
-		devicesRaw, exists := p.Metadata["_devices"]
-		if !exists {
-			// No device registered for this peer
-			continue
+		deviceInfo, err := deviceutils.GetDevices(p.ID.String())
+		if err != nil {
+			return nil, err
 		}
 
-		var deviceInfo []deviceapi.Info
-		if err := json.Unmarshal([]byte(devicesRaw), &deviceInfo); err != nil {
-			return nil, err
+		if len(deviceInfo) == 0 {
+			// No device registered for this peer
+			continue
 		}
 
 		for _, d := range deviceInfo {
@@ -89,8 +88,8 @@ func getAvailableVgs(req *api.VolCreateReq) ([]Vg, error) {
 			}
 
 			vgs = append(vgs, Vg{
-				DeviceName:    d.Name,
-				Name:          d.VgName,
+				Device:        d.Device,
+				Name:          d.VgName(),
 				PeerID:        p.ID.String(),
 				Zone:          peerzone,
 				State:         d.State,

glusterd2/commands/volumes/volume-expand-txn.go

@@ -307,28 +307,27 @@ func expandLocalBricks(volinfo *volume.Volinfo, expansionTpSizePerBrick uint64,
 			if uuid.Equal(b.PeerID, gdctx.MyUUID) {
 				tpName := fmt.Sprintf("tp_%s_s%d_b%d", volinfo.Name, i+1, j+1)
 				lvName := fmt.Sprintf("brick_%s_s%d_b%d", volinfo.Name, i+1, j+1)
-				vgName := brickVgMapping[b.Path]
 				totalExpansionSizePerBrick := expansionTpSizePerBrick + expansionMetadataSizePerBrick
 
 				// extend thinpool
-				err := lvmutils.ExtendThinpool(expansionTpSizePerBrick, vgName, tpName)
+				err := lvmutils.ExtendThinpool(expansionTpSizePerBrick, b.VgName, tpName)
 				if err != nil {
 					return err
 				}
 				// extend metadata pool
-				err = lvmutils.ExtendMetadataPool(expansionMetadataSizePerBrick, vgName, tpName)
+				err = lvmutils.ExtendMetadataPool(expansionMetadataSizePerBrick, b.VgName, tpName)
 				if err != nil {
 					return err
 				}
 
 				// extend lv
-				err = lvmutils.ExtendLV(totalExpansionSizePerBrick, vgName, lvName)
+				err = lvmutils.ExtendLV(totalExpansionSizePerBrick, b.VgName, lvName)
 				if err != nil {
 					return err
 				}
 
 				// Update current Vg free size
-				err = deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), vgName)
+				err = deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), b.RootDevice)
 				if err != nil {
 					return err
 				}

glusterd2/commands/volumes/volume-smartvol-txn.go

@@ -92,7 +92,7 @@ func txnPrepareBricks(c transaction.TxnCtx) error {
 			}
 
 			// Update current Vg free size
-			err = deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), b.VgName)
+			err = deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), b.RootDevice)
 			if err != nil {
 				c.Logger().WithError(err).WithField("vg-name", b.VgName).
 					Error("failed to update available size of a device")
@@ -144,7 +144,7 @@ func txnUndoPrepareBricks(c transaction.TxnCtx) error {
 			}
 
 			// Update current Vg free size
-			deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), b.VgName)
+			deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), b.RootDevice)
 		}
 	}
 

glusterd2/volume/struct.go

@@ -175,6 +175,8 @@ func NewBrickEntries(bricks []api.BrickReq, volName, volfileID string, volID uui
 		binfo.VolfileID = volfileID
 		binfo.VolumeID = volID
 		binfo.ID = uuid.NewRandom()
+		binfo.VgName = b.VgName
+		binfo.RootDevice = b.RootDevice
 
 		binfo.PType = ptype
 		if ptype.IsAutoProvisioned() || ptype.IsSnapshotProvisioned() {

glusterd2/volume/volume-utils.go

@@ -324,7 +324,7 @@ func CleanBricks(volinfo *Volinfo) error {
 		}
 
 		// Update current Vg free size
-		err = deviceutils.UpdateDeviceFreeSize(gdctx.MyUUID.String(), vgname)
+		err = deviceutils.UpdateDeviceFreeSizeByVg(gdctx.MyUUID.String(), vgname)
 		if err != nil {
 			log.WithError(err).WithField("vg-name", vgname).
 				Error("failed to update available size of a device")

pkg/api/volume_req.go

@@ -8,6 +8,7 @@ type BrickReq struct {
 	TpMetadataSize uint64 `json:"metadata-size,omitempty"`
 	TpSize         uint64 `json:"thinpool-size,omitempty"`
 	VgName         string `json:"vg-name,omitempty"`
+	RootDevice     string `json:"root-device,omitempty"`
 	TpName         string `json:"thinpool-name,omitempty"`
 	LvName         string `json:"logical-volume,omitempty"`
 	Size           uint64 `json:"size,omitempty"`

pkg/errors/error.go

@@ -66,4 +66,5 @@ var (
 	ErrInvalidFilenameFormat           = errors.New("filename should be an absolute path in volume, should start with / notation")
 	ErrHostOrBrickNotFound             = errors.New("please specify hostname and brick path to resolve split-brain")
 	ErrVolTypeNotInReplicateOrDisperse = errors.New("invalid operation: the volume is not a replicate or disperse volume")
+	ErrDeviceNotFound                  = errors.New("device does not exist in the given peer")
 )

pkg/restclient/device.go

@@ -10,18 +10,25 @@ import (
 
 // DeviceAdd registers device
 func (c *Client) DeviceAdd(peerid, device string) (deviceapi.AddDeviceResp, error) {
-	var peerinfo deviceapi.AddDeviceResp
+	var deviceinfo deviceapi.AddDeviceResp
 	req := deviceapi.AddDeviceReq{
 		Device: device,
 	}
-	err := c.post("/v1/devices/"+peerid, req, http.StatusOK, &peerinfo)
-	return peerinfo, err
+	err := c.post("/v1/devices/"+peerid, req, http.StatusCreated, &deviceinfo)
+	return deviceinfo, err
 }
 
 // DeviceList lists the devices
-func (c *Client) DeviceList(peerid string) ([]deviceapi.Info, error) {
+func (c *Client) DeviceList(peerid, device string) ([]deviceapi.Info, error) {
 	var deviceList deviceapi.ListDeviceResp
-	url := fmt.Sprintf("/v1/devices/%s", peerid)
+	url := "/v1/devices"
+	if peerid != "" {
+		url = fmt.Sprintf("%s/%s", url, peerid)
+		if device != "" {
+			url = fmt.Sprintf("%s/%s", url, strings.TrimPrefix(device, "/"))
+		}
+	}
+
 	err := c.get(url, nil, http.StatusOK, &deviceList)
 	return deviceList, err
 }

plugins/device/api/resp.go

@@ -1,22 +1,28 @@
 package api
 
 import (
-	"github.com/gluster/glusterd2/pkg/api"
+	"strings"
+
+	"github.com/pborman/uuid"
 )
 
 // Info represents structure in which devices are to be store in Peer Metadata
 type Info struct {
-	Name          string `json:"name"`
-	State         string `json:"state"`
-	VgName        string `json:"vg-name"`
-	AvailableSize uint64 `json:"available-size"`
-	ExtentSize    uint64 `json:"extent-size"`
-	Used          bool   `json:"device-used"`
-	PeerID        string `json:"peer-id"`
+	Device        string    `json:"device"`
+	State         string    `json:"state"`
+	AvailableSize uint64    `json:"available-size"`
+	ExtentSize    uint64    `json:"extent-size"`
+	Used          bool      `json:"device-used"`
+	PeerID        uuid.UUID `json:"peer-id"`
+}
+
+// VgName returns name for LVM Vg
+func (info *Info) VgName() string {
+	return "gluster" + strings.Replace(info.Device, "/", "-", -1)
 }
 
 // AddDeviceResp is the success response sent to a AddDeviceReq request
-type AddDeviceResp api.Peer
+type AddDeviceResp Info
 
 // ListDeviceResp is the success response sent to a ListDevice request
 type ListDeviceResp []Info