Merge branch 'master' of https://github.com/gluster/glusterd2 into de…

…lete_device

e2e/smartvol_ops_test.go

@@ -316,6 +316,30 @@ func testSmartVolumeDistributeDisperse(t *testing.T) {
 	checkZeroLvs(r)
 }
 
+func testDeviceDelete(t *testing.T) {
+	r := require.New(t)
+	peerList, err := client.Peers()
+	r.Nil(err)
+
+	var deviceList []deviceapi.Info
+	var peerID string
+	for _, peer := range peerList {
+		deviceList, err := client.DeviceList(peer.ID.String())
+		r.Nil(err)
+		if len(deviceList) > 1 {
+			peerID = peer.ID.String()
+			break
+		}
+	}
+
+	_, err := client.DeviceDelete(peerID, deviceList[0])
+	r.Nil(err)
+
+	newDeviceList, err := client.DeviceList(peerID)
+
+	r.NotEqual(len(deviceList), len(newDeviceList))
+}
+
 // TestSmartVolume creates a volume and starts it, runs further tests on it and
 // finally deletes the volume
 func TestSmartVolume(t *testing.T) {
@@ -355,6 +379,7 @@ func TestSmartVolume(t *testing.T) {
 	t.Run("Smartvol Disperse Volume", testSmartVolumeDisperse)
 	t.Run("Smartvol Distributed-Replicate Volume", testSmartVolumeDistributeReplicate)
 	t.Run("Smartvol Distributed-Disperse Volume", testSmartVolumeDistributeDisperse)
+	t.Run("Delete device", testDeviceDelete)
 
 	// // Device Cleanup
 	r.Nil(loopDevicesCleanup(t))

pkg/restclient/device.go

@@ -1,6 +1,7 @@
 package restclient
 
 import (
+	"fmt"
 	"net/http"
 
 	deviceapi "github.com/gluster/glusterd2/plugins/device/api"
@@ -15,3 +16,17 @@ func (c *Client) DeviceAdd(peerid string, device string) (deviceapi.AddDeviceRes
 	err := c.post("/v1/devices/"+peerid, req, http.StatusOK, &peerinfo)
 	return peerinfo, err
 }
+
+// DeviceDelete removes devices
+func (c *Client) DeviceDelete(peerid string, device string) error {
+	url := fmt.Sprintf("/v1/devices/+%s+/+%s", peerid, device)
+	return c.del(url, nil, http.StatusNoContent, nil)
+}
+
+// DeviceList lists the devices
+func (c *Client) DeviceList(peerid string) ([]deviceapi.Info, error) {
+	var deviceList deviceapi.ListDeviceResp
+	url := fmt.Sprintf("/v1/devices/%s", peerid)
+	err := c.get(url, nil, http.StatusOK, &deviceList)
+	return deviceList, err
+}

plugins/device/deviceutils/store-utils.go

@@ -199,8 +199,8 @@ func IsVgExist(vgname string) bool {
 }
 
 // getDeviceAvailableSize gets the device size and vgName using device Path
-func getDeviceAvailableSize(devicePath string) (string, uint64, error) {
-	devices, err := GetDevices()
+func getDeviceAvailableSize(peerid, devicePath string) (string, uint64, error) {
+	devices, err := GetDevices(peerid)
 	if err != nil {
 		return "", 0, err
 	}
@@ -235,7 +235,7 @@ func CheckForAvailableVgSize(expansionSize uint64, bricksInfo []brick.Brickinfo)
 	// Check in the map prepared in last step by looking through devices names and device available size of bricks from current node.
 	for _, b := range bricksInfo {
 		// retrieve device available size by device Name and return the vgName and available device Size.
-		vgName, deviceSize, err := getDeviceAvailableSize(b.MountInfo.DevicePath)
+		vgName, deviceSize, err := getDeviceAvailableSize(b.PeerID.String(), b.MountInfo.DevicePath)
 		if err != nil {
 			return map[string]string{}, false, err
 		}

plugins/device/init.go

@@ -48,8 +48,6 @@ func (p *Plugin) RestRoutes() route.Routes {
 			Version:      1,
 			ResponseType: utils.GetTypeString((*deviceapi.ListDeviceResp)(nil)),
 			HandlerFunc:  listAllDevicesHandler},
-		// device name is passed as query param in url.
-		// example: /devices/{peerid}?device="/device/path"
 		route.Route{
 			Name:        "DeviceDelete",
 			Method:      "DELETE",

plugins/device/rest.go

@@ -3,6 +3,7 @@ package device
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/gluster/glusterd2/glusterd2/gdctx"
 	"github.com/gluster/glusterd2/glusterd2/peer"
@@ -183,6 +184,9 @@ func deviceDeleteHandler(w http.ResponseWriter, r *http.Request) {
 		restutils.SendHTTPError(ctx, w, http.StatusBadRequest, "Device name not provided in URL")
 		return
 	}
+	if !strings.HasPrefix(deviceName, "/") {
+		deviceName = "/" + deviceName
+	}
 
 	txn, err := transaction.NewTxnWithLocks(ctx, peerID+deviceName)
 	if err != nil {