Rebalance missing validation and code refactor

glustercli/cmd/rebalance.go

@@ -0,0 +1,76 @@
+package cmd
+
+import (
+	"fmt"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+const (
+	helpRebalanceCmd       = "Gluster Rebalance"
+	helpRebalanceStartCmd  = "Start rebalance operation for gluster volume"
+	helpRebalanceStatusCmd = "Status of rebalance operation"
+	helpRebalanceStopCmd   = "Stop rebalance operation"
+)
+
+var (
+	flagRebalanceStartCmdForce     bool
+	flagRebalanceStartCmdFixLayout bool
+)
+
+var rebalanceCmd = &cobra.Command{
+	Use:   "volume rebalance",
+	Short: helpRebalanceCmd,
+}
+
+func init() {
+
+	// Rebalance Start
+	rebalanceStartCmd.Flags().BoolVar(&flagRebalanceStartCmdForce, "force", false, "Force")
+	rebalanceStartCmd.Flags().BoolVar(&flagRebalanceStartCmdFixLayout, "fixlayout", false, "FixLayout")
+	rebalanceCmd.AddCommand(rebalanceStartCmd)
+
+	RootCmd.AddCommand(rebalanceCmd)
+}
+
+var rebalanceStartCmd = &cobra.Command{
+	Use:   "<VOLNAME> start [flags]",
+	Short: helpRebalanceStartCmd,
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		volname := cmd.Flags().Args()[0]
+		var err error
+		if flagRebalanceStartCmdForce {
+			err = client.RebalanceStart(volname, "force")
+		} else if flagRebalanceStartCmdFixLayout {
+			err = client.RebalanceStart(volname, "fix-layout")
+		} else {
+			err = client.RebalanceStart(volname, "")
+		}
+		if err != nil {
+			if verbose {
+				log.WithError(err).WithField("volume", volname).Error("rebalance start failed")
+			}
+			failure("rebalance start failed", err, 1)
+		}
+		fmt.Printf("Rebalance for %s started successfully\n", volname)
+	},
+}
+
+var rebalanceStopCmd = &cobra.Command{
+	Use:   "<VOLNAME> stop",
+	Short: helpRebalanceStopCmd,
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		volname := cmd.Flags().Args()[0]
+		err := client.RebalanceStop(volname)
+		if err != nil {
+			if verbose {
+				log.WithError(err).WithField("volume", volname).Error("Rebalance stop failed")
+			}
+			failure("rebalance start failed", err, 1)
+		}
+		fmt.Printf("Rebalance for %s stopped successfully\n", volname)
+	},
+}

glustercli/cmd/volume.go

@@ -183,10 +183,7 @@ var volumeStartCmd = &cobra.Command{
 		err := client.VolumeStart(volname, flagStartCmdForce)
 		if err != nil {
 			if verbose {
-				log.WithFields(log.Fields{
-					"volume": volname,
-					"error":  err.Error(),
-				}).Error("volume start failed")
+				log.WithError(err).WithField("volume", volname).Error("volume start failed")
 			}
 			failure("volume start failed", err, 1)
 		}
@@ -203,10 +200,7 @@ var volumeStopCmd = &cobra.Command{
 		err := client.VolumeStop(volname)
 		if err != nil {
 			if verbose {
-				log.WithFields(log.Fields{
-					"volume": volname,
-					"error":  err.Error(),
-				}).Error("volume stop failed")
+				log.WithError(err).WithField("volume", volname).Error("volume stop failed")
 			}
 			failure("Volume stop failed", err, 1)
 		}
@@ -223,10 +217,7 @@ var volumeDeleteCmd = &cobra.Command{
 		err := client.VolumeDelete(volname)
 		if err != nil {
 			if verbose {
-				log.WithFields(log.Fields{
-					"volume": volname,
-					"error":  err.Error(),
-				}).Error("volume deletion failed")
+				log.WithError(err).WithField("volume", volname).Error("volume deletion failed")
 			}
 			failure("Volume deletion failed", err, 1)
 		}
@@ -380,9 +371,7 @@ var volumeInfoCmd = &cobra.Command{
 		err := volumeInfoHandler2(cmd, true)
 		if err != nil {
 			if verbose {
-				log.WithFields(log.Fields{
-					"error": err.Error(),
-				}).Error("error getting volumes list")
+				log.WithError(err).Error("error getting volumes list")
 			}
 			failure("Error getting Volumes list", err, 1)
 		}
@@ -397,9 +386,7 @@ var volumeListCmd = &cobra.Command{
 		err := volumeInfoHandler2(cmd, false)
 		if err != nil {
 			if verbose {
-				log.WithFields(log.Fields{
-					"error": err.Error(),
-				}).Error("error getting volumes list")
+				log.WithError(err).Error("error getting volumes list")
 			}
 			failure("Error getting Volumes list", err, 1)
 		}

pkg/restclient/rebalance.go

@@ -0,0 +1,23 @@
+package restclient
+
+import (
+	"fmt"
+	"net/http"
+
+	rebalanceapi "github.com/gluster/glusterd2/plugins/rebalance/api"
+)
+
+// RebalanceStart starts rebalance process for given volume
+func (c *Client) RebalanceStart(volname string, option string) error {
+	req := rebalanceapi.StartReq{
+		Option: option,
+	}
+	url := fmt.Sprintf("/v1/volumes/%s/rebalance/start", volname)
+	return c.post(url, req, http.StatusOK, nil)
+}
+
+// RebalanceStop stops rebalance process for given volume
+func (c *Client) RebalanceStop(volname string) error {
+	url := fmt.Sprintf("/v1/volumes/%s/rebalance/stop", volname)
+	return c.post(url, nil, http.StatusOK, nil)
+}

plugins/rebalance/api/req_resp.go

@@ -64,6 +64,7 @@ type RebalInfo struct {
 // RebalStatus represents the rebalance status response
 type RebalStatus struct {
 	Volname     string            `json:"volume"`
+	State       Status            `json:"state"`
 	RebalanceID uuid.UUID         `json:"rebalance-id"`
 	Nodes       []RebalNodeStatus `json:"nodes-status"`
 }

plugins/rebalance/errors.go

@@ -7,6 +7,8 @@ import (
 var (
 	// ErrVolNotDistribute : Cannot run rebalance on a non distribute volume
 	ErrVolNotDistribute = errors.New("not a distribute volume")
+	// ErrRebalanceAlreadyStarted : Rebalance already started on the volume
+	ErrRebalanceAlreadyStarted = errors.New("rebalance already started")
 	// ErrRebalanceNotStarted : Rebalance not started on the volume
 	ErrRebalanceNotStarted = errors.New("rebalance not started")
 	// ErrRebalanceInvalidOption : Invalid option provided to the rebalance start command

plugins/rebalance/init.go

@@ -25,22 +25,20 @@ func (p *Plugin) RestRoutes() route.Routes {
 			Pattern:     "/volumes/{volname}/rebalance/start",
 			Version:     1,
 			RequestType: utils.GetTypeString((*rebalanceapi.StartReq)(nil)),
-			//			ResponseType: utils.GetTypeString((*rebalanceapi.RebalInfo)(nil)),
 			HandlerFunc: rebalanceStartHandler},
 		route.Route{
-			Name:    "RebalanceStop",
-			Method:  "POST",
-			Pattern: "/volumes/{volname}/rebalance/stop",
-			Version: 1,
-			//			ResponseType: utils.GetTypeString((*rebalanceapi.RebalInfo)(nil)),
+			Name:        "RebalanceStop",
+			Method:      "POST",
+			Pattern:     "/volumes/{volname}/rebalance/stop",
+			Version:     1,
 			HandlerFunc: rebalanceStopHandler},
 		route.Route{
-			Name:    "RebalanceStatus",
-			Method:  "GET",
-			Pattern: "/volumes/{volname}/rebalance",
-			Version: 1,
-			//			ResponseType: utils.GetTypeString((*rebalanceapi.RebalInfo)(nil)),
-			HandlerFunc: rebalanceStatusHandler},
+			Name:         "RebalanceStatus",
+			Method:       "GET",
+			Pattern:      "/volumes/{volname}/rebalance",
+			Version:      1,
+			ResponseType: utils.GetTypeString((*rebalanceapi.RebalStatus)(nil)),
+			HandlerFunc:  rebalanceStatusHandler},
 	}
 }