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

rishubhjain · rishubhjain · commit a7fe8e3a4bc0 · 2018-07-10T12:44:54.000-04:00
diff --git a/e2e/bitrot_test.go b/e2e/bitrot_test.go
@@ -18,7 +18,7 @@ func TestBitrot(t *testing.T) {
 	r.Nil(err)
 	defer teardownCluster(gds)
 
-	client = initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client = initRestclient(gds[0])
 
 	// test Bitrot on dist-rep volume
 	t.Run("Replica-volume", testBitrotOnReplicaVolume)
diff --git a/e2e/georep_test.go b/e2e/georep_test.go
@@ -28,7 +28,7 @@ func TestGeorepCreateDelete(t *testing.T) {
 		brickPaths = append(brickPaths, brickPath)
 	}
 
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 
 	volname := formatVolName(t.Name())
 	reqVol := api.VolCreateReq{
diff --git a/e2e/glustershd_test.go b/e2e/glustershd_test.go
@@ -27,7 +27,7 @@ func TestSelfHealInfo(t *testing.T) {
 		brickPaths[i-1] = brickPath
 	}
 
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 	volname := formatVolName(t.Name())
 	reqVol := api.VolCreateReq{
 		Name: volname,
diff --git a/e2e/peer_ops_test.go b/e2e/peer_ops_test.go
@@ -27,7 +27,7 @@ func TestAddRemovePeer(t *testing.T) {
 	defer g3.Stop()
 	r.True(g3.IsRunning())
 
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 	peerAddReq := api.PeerAddReq{
 		Addresses: []string{g2.PeerAddress},
 		Metadata: map[string]string{
diff --git a/e2e/quota_enable.go b/e2e/quota_enable.go
@@ -35,7 +35,7 @@ func TestQuota(t *testing.T) {
 		brickPaths = append(brickPaths, brickPath)
 	}
 
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 
 	// create 2x2 dist-rep volume
 	createReq := api.VolCreateReq{
diff --git a/e2e/restart_test.go b/e2e/restart_test.go
@@ -21,7 +21,7 @@ func TestRestart(t *testing.T) {
 	r.Nil(err)
 	defer os.RemoveAll(dir)
 
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 
 	createReq := api.VolCreateReq{
 		Name: formatVolName(t.Name()),
@@ -52,7 +52,7 @@ func TestRestart(t *testing.T) {
 }
 
 func getVols(gd *gdProcess, r *require.Assertions) api.VolumeListResp {
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 	volname := ""
 	vols, err := client.Volumes(volname)
 	r.Nil(err)
diff --git a/e2e/smartvol_ops_test.go b/e2e/smartvol_ops_test.go
@@ -236,7 +236,7 @@ func TestSmartVolume(t *testing.T) {
 	r.Nil(err)
 	defer teardownCluster(gds)
 
-	client = initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client = initRestclient(gds[0])
 
 	devicesDir, err := ioutil.TempDir(baseLocalStateDir, t.Name())
 	r.Nil(err)
diff --git a/e2e/utils_test.go b/e2e/utils_test.go
@@ -192,7 +192,7 @@ func setupCluster(configFiles ...string) ([]*gdProcess, error) {
 	}
 
 	// restclient instance that will be used for peer operations
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 
 	// first gd2 instance spawned shall add other glusterd2 instances as its peers
 	for i, gd := range gds {
@@ -238,9 +238,9 @@ func teardownCluster(gds []*gdProcess) error {
 	return nil
 }
 
-func initRestclient(clientAddress, authPath string) *restclient.Client {
-	secret := getAuth(authPath)
-	return restclient.New("http://"+clientAddress, "glustercli", secret, "", false)
+func initRestclient(gdp *gdProcess) *restclient.Client {
+	secret := getAuth(gdp.LocalStateDir)
+	return restclient.New("http://"+gdp.ClientAddress, "glustercli", secret, "", false)
 }
 
 func prepareLoopDevice(devname, loopnum, size string) error {
diff --git a/e2e/volume_ops_test.go b/e2e/volume_ops_test.go
@@ -40,7 +40,7 @@ func TestVolume(t *testing.T) {
 	r.Nil(err)
 	defer teardownCluster(gds)
 
-	client = initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client = initRestclient(gds[0])
 
 	t.Run("CreateWithoutName", testVolumeCreateWithoutName)
 
@@ -418,7 +418,7 @@ func TestVolumeOptions(t *testing.T) {
 	brickPath, err := ioutil.TempDir(brickDir, "brick")
 	r.Nil(err)
 
-	client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client := initRestclient(gds[0])
 
 	volname := "testvol"
 	createReq := api.VolCreateReq{
@@ -451,6 +451,11 @@ func TestVolumeOptions(t *testing.T) {
 		_, err = client.VolumeGet(volname, validKey)
 		r.Nil(err)
 
+		var resetOptionReq api.VolOptionResetReq
+		resetOptionReq.Options = append(resetOptionReq.Options, validKey)
+		resetOptionReq.Force = true
+		r.Nil(client.VolumeReset(volname, resetOptionReq))
+
 		err = client.VolumeDelete(volname)
 		r.Nil(err)
 	}
@@ -485,9 +490,26 @@ func TestVolumeOptions(t *testing.T) {
 	settableKey := "afr.use-compound-fops"
 	optionReq.Options = map[string]string{settableKey: "on"}
 	r.Nil(client.VolumeSet(volname, optionReq))
+
+	var resetOptionReq api.VolOptionResetReq
+	resetOptionReq.Options = []string{"afr.use-compound-fops"}
+	resetOptionReq.Force = true
+	r.Nil(client.VolumeReset(volname, resetOptionReq))
+
+	validOpKeys = []string{"io-stats.count-fop-hits", "io-stats.latency-measurement"}
+	for _, validKey := range validOpKeys {
+		optionReq.Options = map[string]string{validKey: "on"}
+		r.Nil(client.VolumeSet(volname, optionReq))
+	}
+
+	resetOptionReq.Force = true
+	resetOptionReq.All = true
+	r.Nil(client.VolumeReset(volname, resetOptionReq))
+
 	notSettableKey := "afr.consistent-io"
 	optionReq.Options = map[string]string{notSettableKey: "on"}
 	r.NotNil(client.VolumeSet(volname, optionReq))
+
 	r.Nil(client.VolumeDelete(volname))
 
 	// group option test cases
@@ -501,7 +523,6 @@ func TestVolumeOptions(t *testing.T) {
 		err = client.VolumeDelete(volname)
 		r.Nil(err)
 	}
-
 	for _, validKey := range groupOpKeys {
 		createReq.Options = map[string]string{validKey: "off"}
 
diff --git a/e2e/webhook_test.go b/e2e/webhook_test.go
@@ -24,7 +24,7 @@ func TestWebhook(t *testing.T) {
 	r.Nil(err)
 	defer teardownCluster(gds)
 
-	client = initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)
+	client = initRestclient(gds[0])
 
 	t.Run("Register-webhook", testAddWebhook)
 	t.Run("List-webhook", testGetWebhook)
diff --git a/glustercli/cmd/volume-reset.go b/glustercli/cmd/volume-reset.go
@@ -0,0 +1,61 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/gluster/glusterd2/pkg/api"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+const (
+	volumeResetCmdHelpShort = "Reset volume options"
+	volumeResetCmdHelpLong  = "Reset options on a specified gluster volume. Needs a volume name and at least one option"
+)
+
+var (
+	flagForce, flagResetAll bool
+)
+
+var volumeResetCmd = &cobra.Command{
+	Use:   "reset <volname> <options>",
+	Short: volumeResetCmdHelpShort,
+	Long:  volumeResetCmdHelpLong,
+	Args:  cobra.RangeArgs(1, 2),
+	Run: func(cmd *cobra.Command, args []string) {
+		volname := args[0]
+		options := args[1:]
+		req := api.VolOptionResetReq{
+			Force: flagForce,
+			All:   flagResetAll,
+		}
+		if flagResetAll {
+			req.Options = []string{}
+		} else {
+			if len(args) < 2 {
+				failure("Specify atleast one volume option to reset", errors.New("Specify atleast one volume option to reset"), 1)
+			} else {
+				req.Options = options
+			}
+		}
+		err := client.VolumeReset(volname, req)
+		if err != nil {
+			if verbose {
+				log.WithFields(log.Fields{
+					"volume": volname,
+					"error":  err.Error(),
+				}).Error("volume reset failed")
+			}
+			failure("Volume reset failed", err, 1)
+		}
+		fmt.Printf("Volume options reset successfully\n")
+	},
+}
+
+func init() {
+	volumeResetCmd.Flags().BoolVar(&flagForce, "force", false, "Force reset the volume option")
+	volumeResetCmd.Flags().BoolVar(&flagResetAll, "all", false, "Reset all the volume options")
+	volumeCmd.AddCommand(volumeResetCmd)
+}
diff --git a/glustercli/cmd/volume.go b/glustercli/cmd/volume.go
@@ -22,7 +22,6 @@ const (
 	helpVolumeStopCmd   = "Stop a Gluster Volume"
 	helpVolumeDeleteCmd = "Delete a Gluster Volume"
 	helpVolumeGetCmd    = "Get Gluster Volume Options"
-	helpVolumeResetCmd  = "Reset a Gluster Volume Option"
 	helpVolumeInfoCmd   = "Get Gluster Volume Info"
 	helpVolumeListCmd   = "List all Gluster Volumes"
 	helpVolumeStatusCmd = "Get Gluster Volume Status"
@@ -75,7 +74,7 @@ func init() {
 	volumeGetCmd.Flags().BoolVar(&flagGetBsc, "basic", true, "Get basic options")
 	volumeGetCmd.Flags().BoolVar(&flagGetMdf, "modified", false, "Get modified options")
 	volumeCmd.AddCommand(volumeGetCmd)
-	volumeCmd.AddCommand(volumeResetCmd)
+
 	volumeCmd.AddCommand(volumeSizeCmd)
 
 	volumeInfoCmd.Flags().StringVar(&flagCmdFilterKey, "key", "", "Filter by metadata key")
@@ -272,16 +271,6 @@ var volumeGetCmd = &cobra.Command{
 	},
 }
 
-var volumeResetCmd = &cobra.Command{
-	Use:   "reset",
-	Short: helpVolumeResetCmd,
-	Args:  cobra.RangeArgs(1, 2),
-	Run: func(cmd *cobra.Command, args []string) {
-		volname := cmd.Flags().Args()[0]
-		fmt.Println("RESET:", volname)
-	},
-}
-
 func volumeInfoDisplayNumbricks(vol api.VolumeGetResp) {
 
 	var DistCount = len(vol.Subvols)
diff --git a/glusterd2/commands/volumes/volume-reset.go b/glusterd2/commands/volumes/volume-reset.go
@@ -60,6 +60,21 @@ func volumeResetHandler(w http.ResponseWriter, r *http.Request) {
 	oldvolinfo := volinfo
 	// Delete the option after checking for volopt flags
 	opReset := false
+
+	if req.All {
+		req.Options = []string{}
+		for key := range volinfo.Options {
+			op, err := xlator.FindOption(key)
+			if err != nil {
+				restutils.SendHTTPError(ctx, w, http.StatusInternalServerError, err)
+				return
+			}
+			if !op.IsNeverReset() {
+				req.Options = append(req.Options, key)
+			}
+		}
+	}
+
 	for _, k := range req.Options {
 		// Check if the key is set or not
 		if _, ok := volinfo.Options[k]; ok {
diff --git a/glusterd2/gdctx/global.go b/glusterd2/gdctx/global.go
@@ -94,18 +94,29 @@ func GenerateLocalAuthToken() error {
 }
 
 func protectAuthFile(authfile string) error {
-	usr, err := user.LookupGroup("gluster")
+	var uGID string
+
+	cuser, err := user.Current()
 	if err != nil {
 		return err
 	}
-	gID, err := strconv.Atoi(usr.Gid)
+
+	uGID = cuser.Gid
+
+	usr, err := user.LookupGroup("gluster")
 	if err != nil {
-		return err
+		if _, ok := err.(user.UnknownGroupError); !ok {
+			return err
+		}
+	} else {
+		uGID = usr.Gid
 	}
-	cuser, err := user.Current()
+
+	gID, err := strconv.Atoi(uGID)
 	if err != nil {
 		return err
 	}
+
 	uID, err := strconv.Atoi(cuser.Uid)
 	if err != nil {
 		return err
diff --git a/pkg/api/volume_req.go b/pkg/api/volume_req.go
@@ -49,8 +49,9 @@ type VolOptionReq struct {
 
 // VolOptionResetReq represents a request to reset volume options
 type VolOptionResetReq struct {
-	Options []string `json:"options"`
+	Options []string `json:"options,omitempty"`
 	Force   bool     `json:"force,omitempty"`
+	All     bool     `json:"all,omitempty"`
 }
 
 // VolExpandReq represents a request to expand the volume by adding more bricks
diff --git a/pkg/restclient/volume.go b/pkg/restclient/volume.go
@@ -185,3 +185,9 @@ func (c *Client) EditVolume(volname string, req api.VolEditReq) (api.VolumeEditR
 	err := c.post(url, req, http.StatusOK, &resp)
 	return resp, err
 }
+
+// VolumeReset resets volume options to their default values
+func (c *Client) VolumeReset(volname string, req api.VolOptionResetReq) error {
+	url := fmt.Sprintf("/v1/volumes/%s/options", volname)
+	return c.del(url, req, http.StatusOK, nil)
+}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func TestGeorepCreateDelete(t *testing.T) {`
`28`	`28`	`brickPaths = append(brickPaths, brickPath)`
`29`	`29`	`}`
`30`	`30`
`31`		`- client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)`
	`31`	`+ client := initRestclient(gds[0])`
`32`	`32`
`33`	`33`	`volname := formatVolName(t.Name())`
`34`	`34`	`reqVol := api.VolCreateReq{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func TestSelfHealInfo(t *testing.T) {`
`27`	`27`	`brickPaths[i-1] = brickPath`
`28`	`28`	`}`
`29`	`29`
`30`		`- client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)`
	`30`	`+ client := initRestclient(gds[0])`
`31`	`31`	`volname := formatVolName(t.Name())`
`32`	`32`	`reqVol := api.VolCreateReq{`
`33`	`33`	`Name: volname,`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func TestQuota(t *testing.T) {`
`35`	`35`	`brickPaths = append(brickPaths, brickPath)`
`36`	`36`	`}`
`37`	`37`
`38`		`- client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)`
	`38`	`+ client := initRestclient(gds[0])`
`39`	`39`
`40`	`40`	`// create 2x2 dist-rep volume`
`41`	`41`	`createReq := api.VolCreateReq{`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func setupCluster(configFiles ...string) ([]*gdProcess, error) {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`// restclient instance that will be used for peer operations`
`195`		`- client := initRestclient(gds[0].ClientAddress, gds[0].LocalStateDir)`
	`195`	`+ client := initRestclient(gds[0])`
`196`	`196`
`197`	`197`	`// first gd2 instance spawned shall add other glusterd2 instances as its peers`
`198`	`198`	`for i, gd := range gds {`
`@@ -238,9 +238,9 @@ func teardownCluster(gds []*gdProcess) error {`
`238`	`238`	`return nil`
`239`	`239`	`}`
`240`	`240`
`241`		`-func initRestclient(clientAddress, authPath string) *restclient.Client {`
`242`		`- secret := getAuth(authPath)`
`243`		`- return restclient.New("http://"+clientAddress, "glustercli", secret, "", false)`
	`241`	`+func initRestclient(gdp gdProcess) restclient.Client {`
	`242`	`+ secret := getAuth(gdp.LocalStateDir)`
	`243`	`+ return restclient.New("http://"+gdp.ClientAddress, "glustercli", secret, "", false)`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`func prepareLoopDevice(devname, loopnum, size string) error {`