Plugin architecture for brick Provisioners

e2e/smartvol_ops_test.go

@@ -29,7 +29,7 @@ func brickSizeTest(brickpath string, min uint64, max uint64) error {
 
 func checkZeroLvs(r *require.Assertions) {
 	for i := 1; i < 3; 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)

glusterd2/brick/types.go

@@ -33,6 +33,7 @@ type MountInfo struct {
 // Brickinfo is the static information about the brick
 type Brickinfo struct {
 	ID             uuid.UUID
+	Name           string
 	Hostname       string
 	PeerID         uuid.UUID
 	Path           string
@@ -42,6 +43,7 @@ type Brickinfo struct {
 	Type           Type
 	Decommissioned bool
 	PType          ProvisionType
+	Device         string
 	MountInfo
 }
 

glusterd2/bricksplanner/planner.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/gluster/glusterd2/glusterd2/volume"
 	"github.com/gluster/glusterd2/pkg/api"
-	"github.com/gluster/glusterd2/plugins/device/deviceutils"
+	"github.com/gluster/glusterd2/pkg/lvmutils"
 
 	config "github.com/spf13/viper"
 )
@@ -76,7 +76,7 @@ func getBricksLayout(req *api.VolCreateReq) ([]api.SubvolReq, error) {
 
 	// User input will be in MBs, convert to KBs for all
 	// internal usage
-	subvolSize := deviceutils.MbToKb(req.Size)
+	subvolSize := lvmutils.MbToKb(req.Size)
 	if numSubvols > 1 {
 		subvolSize = subvolSize / uint64(numSubvols)
 	}
@@ -118,19 +118,13 @@ func getBricksLayout(req *api.VolCreateReq) ([]api.SubvolReq, error) {
 		for j := 0; j < subvolplanner.BricksCount(); j++ {
 			eachBrickSize := subvolplanner.BrickSize(j)
 			brickType := subvolplanner.BrickType(j)
-			eachBrickTpSize := uint64(float64(eachBrickSize) * req.SnapshotReserveFactor)
 
 			bricks = append(bricks, api.BrickReq{
-				Type:           brickType,
-				Path:           fmt.Sprintf("%s/%s/subvol%d/brick%d/brick", bricksMountRoot, req.Name, i+1, j+1),
-				Mountdir:       "/brick",
-				TpName:         fmt.Sprintf("tp_%s_s%d_b%d", req.Name, i+1, j+1),
-				LvName:         fmt.Sprintf("brick_%s_s%d_b%d", req.Name, i+1, j+1),
-				Size:           eachBrickSize,
-				TpSize:         eachBrickTpSize,
-				TpMetadataSize: deviceutils.GetPoolMetadataSize(eachBrickTpSize),
-				FsType:         "xfs",
-				MntOpts:        "rw,inode64,noatime,nouuid",
+				Type:     brickType,
+				Path:     fmt.Sprintf("%s/%s/subvol%d/brick%d/brick", bricksMountRoot, req.Name, i+1, j+1),
+				Mountdir: "/brick",
+				Name:     fmt.Sprintf("%s_s%d_b%d", req.Name, i+1, j+1),
+				Size:     eachBrickSize,
 			})
 		}
 
@@ -177,14 +171,15 @@ func PlanBricks(req *api.VolCreateReq) error {
 		// with device with expected space available.
 		numBricksAllocated := 0
 		for bidx, b := range sv.Bricks {
-			totalsize := b.TpSize + b.TpMetadataSize
+			tpSize := uint64(float64(b.Size) * req.SnapshotReserveFactor)
+			tpMetadataSize := lvmutils.GetTpMetadataSize(tpSize)
+			totalsize := tpSize + tpMetadataSize
 
 			for _, vg := range availableVgs {
 				_, zoneUsed := zones[vg.Zone]
 				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].DevicePath = "/dev/" + vg.Name + "/" + b.LvName
+					subvols[idx].Bricks[bidx].Device = vg.Device
 
 					zones[vg.Zone] = struct{}{}
 					numBricksAllocated++
@@ -205,14 +200,15 @@ func PlanBricks(req *api.VolCreateReq) error {
 		// but enough space is available in the devices
 		for bidx := numBricksAllocated; bidx < len(sv.Bricks); bidx++ {
 			b := sv.Bricks[bidx]
-			totalsize := b.TpSize + b.TpMetadataSize
+			tpSize := uint64(float64(b.Size) * req.SnapshotReserveFactor)
+			tpMetadataSize := lvmutils.GetTpMetadataSize(tpSize)
+			totalsize := tpSize + tpMetadataSize
 
 			for _, vg := range availableVgs {
 				_, zoneUsed := zones[vg.Zone]
 				if vg.AvailableSize >= totalsize && !zoneUsed {
 					subvols[idx].Bricks[bidx].PeerID = vg.PeerID
-					subvols[idx].Bricks[bidx].VgName = vg.Name
-					subvols[idx].Bricks[bidx].DevicePath = "/dev/" + vg.Name + "/" + b.LvName
+					subvols[idx].Bricks[bidx].Device = vg.Device
 
 					zones[vg.Zone] = struct{}{}
 					numBricksAllocated++

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)
@@ -24,8 +24,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,14 +70,8 @@ func getAvailableVgs(req *api.VolCreateReq) ([]Vg, error) {
 			continue
 		}
 
-		devicesRaw, exists := p.Metadata["_devices"]
-		if !exists {
-			// No device registered for this peer
-			continue
-		}
-
-		var deviceInfo []deviceapi.Info
-		if err := json.Unmarshal([]byte(devicesRaw), &deviceInfo); err != nil {
+		deviceInfo, err := deviceutils.GetDevices(p.ID.String())
+		if err != nil {
 			return nil, err
 		}
 
@@ -89,8 +82,7 @@ func getAvailableVgs(req *api.VolCreateReq) ([]Vg, error) {
 			}
 
 			vgs = append(vgs, Vg{
-				DeviceName:    d.Name,
-				Name:          d.VgName,
+				Device:        d.Device,
 				PeerID:        p.ID.String(),
 				Zone:          peerzone,
 				State:         d.State,

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

@@ -128,6 +128,7 @@ func newVolinfo(req *api.VolCreateReq) (*volume.Volinfo, error) {
 		DistCount:             len(req.Subvols),
 		SnapList:              []string{},
 		SnapshotReserveFactor: req.SnapshotReserveFactor,
+		Provisioner:           req.Provisioner,
 		Auth: volume.VolAuth{
 			Username: uuid.NewRandom().String(),
 			Password: uuid.NewRandom().String(),

glusterd2/commands/volumes/volume-delete.go

@@ -78,7 +78,9 @@ func volumeDeleteHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	bricksAutoProvisioned := volinfo.IsAutoProvisioned() || volinfo.IsSnapshotProvisioned()
+	// TODO: Include volinfo.IsSnapshotProvisioned() once
+	// Snapshot integrated with Provisioner interface
+	bricksAutoProvisioned := volinfo.IsAutoProvisioned()
 	txn.Steps = []*transaction.Step{
 		{
 			DoFunc: "vol-delete.CleanBricks",