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

Conflicts:
	pkg/errors/error.go

doc/quick-start-user-guide.md

@@ -83,9 +83,9 @@ INFO[2017-08-28T16:03:58+05:30] started GlusterD SunRPC server                ip
 
 Now you have two nodes running glusterd2.
 
-> NOTE: Ensure that firewalld is configured (or stopped) to let traffic on ports ` before attaching a peer.
+> NOTE: Ensure that firewalld is configured (or stopped) to let traffic on ports ` before adding a peer.
 
-## Attach peer
+## Add peer
 
 Glusterd2 natively provides only ReST API for clients to perform management operations. A CLI is provided which interacts with glusterd2 using the [ReST APIs](https://github.com/gluster/glusterd2/wiki/ReST-API).
 
@@ -99,7 +99,7 @@ $ cat addpeer.json
 	"addresses": ["192.168.56.102"]
 }
 ```
-`addresses` takes a list of address by which the new host can be added. It can be FQDNs, short-names or IP addresses. Note that if you want to attach multiple peers use below API to attach each peer one at a time.
+`addresses` takes a list of address by which the new host can be added. It can be FQDNs, short-names or IP addresses. Note that if you want to add multiple peers use below API to add each peer one at a time.
 
 Send a HTTP request to `node1` to add `node2` as peer:
 
@@ -109,7 +109,7 @@ $ curl -X POST http://192.168.56.101:24007/v1/peers --data @addpeer.json -H 'Con
 
 or using glustercli:
 
-    $ glustercli peer probe 192.168.56.102
+    $ glustercli peer add 192.168.56.102
 
 You will get the Peer ID of the newly added peer as response.
 
@@ -123,7 +123,7 @@ $ curl -X GET http://192.168.56.101:24007/v1/peers
 
 or by using the glustercli:
 
-    $ glustercli pool list
+    $ glustercli peer list
 
 Note the UUIDs in the response. We will use the same in volume create request below.
 
@@ -199,4 +199,4 @@ Verify that `glusterfsd` process is running on both nodes.
 
 * Issues with 2 node clusters
   * Restarting glusterd2 does not restore the cluster
-  * Peer detach doesn't work
+  * Peer remove doesn't work

e2e/peer_ops_test.go

@@ -27,13 +27,13 @@ func TestAddRemovePeer(t *testing.T) {
 
 	client := initRestclient(g1.ClientAddress)
 
-	_, err2 := client.PeerProbe(g2.PeerAddress)
+	_, err2 := client.PeerAdd(g2.PeerAddress)
 	r.Nil(err2)
 
 	time.Sleep(6 * time.Second)
 
 	// add peer: ask g1 to add g3 as peer
-	_, err3 := client.PeerProbe(g3.PeerAddress)
+	_, err3 := client.PeerAdd(g3.PeerAddress)
 	r.Nil(err3)
 
 	time.Sleep(6 * time.Second)
@@ -44,6 +44,6 @@ func TestAddRemovePeer(t *testing.T) {
 	r.Len(peers, 3)
 
 	// remove peer: ask g1 to remove g2 as peer
-	err5 := client.PeerDetach(g2.PeerID())
+	err5 := client.PeerRemove(g2.PeerID())
 	r.Nil(err5)
 }

e2e/volume_ops_test.go

@@ -100,6 +100,9 @@ func testVolumeCreate(t *testing.T) {
 				},
 			},
 		},
+		Metadata: map[string]string{
+			"owner": "gd2test",
+		},
 		Force: true,
 	}
 	_, err := client.VolumeCreate(createReq)
@@ -148,6 +151,40 @@ func testVolumeStop(t *testing.T) {
 
 func testVolumeList(t *testing.T) {
 	r := require.New(t)
+	var matchingQueries []map[string]string
+	var nonMatchingQueries []map[string]string
+
+	matchingQueries = append(matchingQueries, map[string]string{
+		"key":   "owner",
+		"value": "gd2test",
+	})
+	matchingQueries = append(matchingQueries, map[string]string{
+		"key": "owner",
+	})
+	matchingQueries = append(matchingQueries, map[string]string{
+		"value": "gd2test",
+	})
+	for _, filter := range matchingQueries {
+		volumes, err := client.Volumes("", filter)
+		r.Nil(err)
+		r.Len(volumes, 1)
+	}
+
+	nonMatchingQueries = append(nonMatchingQueries, map[string]string{
+		"key":   "owner",
+		"value": "gd2-test",
+	})
+	nonMatchingQueries = append(nonMatchingQueries, map[string]string{
+		"key": "owners",
+	})
+	nonMatchingQueries = append(nonMatchingQueries, map[string]string{
+		"value": "gd2tests",
+	})
+	for _, filter := range nonMatchingQueries {
+		volumes, err := client.Volumes("", filter)
+		r.Nil(err)
+		r.Len(volumes, 0)
+	}
 
 	volumes, err := client.Volumes("")
 	r.Nil(err)

glustercli/cmd/bitrot.go

@@ -100,6 +100,8 @@ var bitrotScrubThrottleCmd = &cobra.Command{
 		option = append(option, "bit-rot.scrub-throttle")
 		option = append(option, args[1])
 
+		// Set Option set flag to advanced
+		flagSetAdv = true
 		err := volumeOptionJSONHandler(cmd, volname, option)
 		if err != nil {
 			if verbose {
@@ -125,6 +127,8 @@ var bitrotScrubFrequencyCmd = &cobra.Command{
 		option = append(option, "bit-rot.scrub-freq")
 		option = append(option, args[1])
 
+		// Set Option set flag to advanced
+		flagSetAdv = true
 		err := volumeOptionJSONHandler(cmd, volname, option)
 		if err != nil {
 			if verbose {
@@ -152,6 +156,9 @@ var bitrotScrubCmd = &cobra.Command{
 		case scrubPause, scrubResume:
 			option = append(option, "bit-rot.scrub-state")
 			option = append(option, args[1])
+
+			// Set Option set flag to advanced
+			flagSetAdv = true
 			err := volumeOptionJSONHandler(cmd, volname, option)
 			if err != nil {
 				if verbose {

glustercli/cmd/peer.go

@@ -14,86 +14,80 @@ import (
 
 const (
 	helpPeerCmd       = "Gluster Peer Management"
-	helpPeerProbeCmd  = "probe peer specified by <HOSTNAME>"
-	helpPeerDetachCmd = "detach peer specified by <HOSTNAME or PeerID>"
+	helpPeerAddCmd    = "add peer specified by <HOSTNAME>"
+	helpPeerRemoveCmd = "remove peer specified by <HOSTNAME or PeerID>"
 	helpPeerStatusCmd = "list status of peers"
-	helpPoolListCmd   = "list all the nodes in the pool (including localhost)"
+	helpPeerListCmd   = "list all the nodes in the pool (including localhost)"
 )
 
 var (
-	// Peer Detach Command Flags
-	flagPeerDetachForce bool
+	// Peer Remove Command Flags
+	flagPeerRemoveForce bool
 )
 
 func init() {
-	peerCmd.AddCommand(peerProbeCmd)
+	peerCmd.AddCommand(peerAddCmd)
 
-	peerDetachCmd.Flags().BoolVarP(&flagPeerDetachForce, "force", "f", false, "Force")
+	peerRemoveCmd.Flags().BoolVarP(&flagPeerRemoveForce, "force", "f", false, "Force")
 
-	peerCmd.AddCommand(peerDetachCmd)
+	peerCmd.AddCommand(peerRemoveCmd)
 
 	peerCmd.AddCommand(peerStatusCmd)
 
-	poolCmd.AddCommand(poolListCmd)
+	peerCmd.AddCommand(peerListCmd)
 
 	RootCmd.AddCommand(peerCmd)
-	RootCmd.AddCommand(poolCmd)
 }
 
 var peerCmd = &cobra.Command{
 	Use:   "peer",
 	Short: helpPeerCmd,
 }
 
-var poolCmd = &cobra.Command{
-	Use:   "pool",
-	Short: helpPeerCmd,
-}
-
-var peerProbeCmd = &cobra.Command{
-	Use:   "probe <HOSTNAME>",
-	Short: helpPeerProbeCmd,
+var peerAddCmd = &cobra.Command{
+	Use:   "add <HOSTNAME>",
+	Short: helpPeerAddCmd,
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		hostname := cmd.Flags().Args()[0]
-		peer, err := client.PeerProbe(hostname)
+		peer, err := client.PeerAdd(hostname)
 		if err != nil {
 			if verbose {
 				log.WithFields(log.Fields{
 					"host":  hostname,
 					"error": err.Error(),
-				}).Error("peer probe failed")
+				}).Error("peer add failed")
 			}
-			failure("Peer probe failed", err, 1)
+			failure("Peer add failed", err, 1)
 		}
-		fmt.Println("Peer probe successful")
+		fmt.Println("Peer add successful")
 		table := tablewriter.NewWriter(os.Stdout)
 		table.SetHeader([]string{"ID", "Name", "Peer Addresses"})
 		table.Append([]string{peer.ID.String(), peer.Name, strings.Join(peer.PeerAddresses, ",")})
 		table.Render()
 	},
 }
 
-var peerDetachCmd = &cobra.Command{
-	Use:   "detach <HOSTNAME or PeerID>",
-	Short: helpPeerDetachCmd,
+var peerRemoveCmd = &cobra.Command{
+	Use:   "remove <HOSTNAME or PeerID>",
+	Short: helpPeerRemoveCmd,
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		hostname := cmd.Flags().Args()[0]
 		peerID, err := getPeerID(hostname)
 		if err == nil {
-			err = client.PeerDetach(peerID)
+			err = client.PeerRemove(peerID)
 		}
 		if err != nil {
 			if verbose {
 				log.WithFields(log.Fields{
 					"host":  hostname,
 					"error": err.Error(),
-				}).Error("peer detach failed")
+				}).Error("peer remove failed")
 			}
-			failure("Peer detach failed", err, 1)
+			failure("Peer remove failed", err, 1)
 		}
-		fmt.Println("Peer detach success")
+		fmt.Println("Peer remove success")
 	},
 }
 
@@ -108,9 +102,9 @@ func peerStatusHandler(cmd *cobra.Command) {
 		failure("Failed to get Peers list", err, 1)
 	}
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"ID", "Name", "Peer Addresses"})
+	table.SetHeader([]string{"ID", "Name", "Peer Addresses", "Online"})
 	for _, peer := range peers {
-		table.Append([]string{peer.ID.String(), peer.Name, strings.Join(peer.PeerAddresses, ",")})
+		table.Append([]string{peer.ID.String(), peer.Name, strings.Join(peer.PeerAddresses, ","), formatBoolYesNo(peer.Online)})
 	}
 	table.Render()
 }
@@ -124,9 +118,9 @@ var peerStatusCmd = &cobra.Command{
 	},
 }
 
-var poolListCmd = &cobra.Command{
+var peerListCmd = &cobra.Command{
 	Use:   "list",
-	Short: helpPoolListCmd,
+	Short: helpPeerListCmd,
 	Args:  cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		peerStatusHandler(cmd)

glustercli/cmd/utils.go

@@ -0,0 +1,8 @@
+package cmd
+
+func formatBoolYesNo(value bool) string {
+	if value == true {
+		return "yes"
+	}
+	return "no"
+}

glustercli/cmd/volume.go

@@ -41,6 +41,10 @@ var (
 	flagExpandCmdReplicaCount int
 	flagExpandCmdForce        bool
 
+	// Filter Volume Info/List command flags
+	flagCmdFilterKey   string
+	flagCmdFilterValue string
+
 	// Edit Command Flags
 	flagCmdMetadataKey    string
 	flagCmdMetadataValue  string
@@ -62,10 +66,14 @@ func init() {
 	volumeCmd.AddCommand(volumeGetCmd)
 	volumeCmd.AddCommand(volumeResetCmd)
 
+	volumeInfoCmd.Flags().StringVar(&flagCmdFilterKey, "key", "", "Filter by metadata key")
+	volumeInfoCmd.Flags().StringVar(&flagCmdFilterValue, "value", "", "Filter by metadata value")
 	volumeCmd.AddCommand(volumeInfoCmd)
 
 	volumeCmd.AddCommand(volumeStatusCmd)
 
+	volumeListCmd.Flags().StringVar(&flagCmdFilterKey, "key", "", "Filter by metadata Key")
+	volumeListCmd.Flags().StringVar(&flagCmdFilterValue, "value", "", "Filter by metadata value")
 	volumeCmd.AddCommand(volumeListCmd)
 
 	// Volume Expand
@@ -254,13 +262,16 @@ func volumeInfoDisplayNumbricks(vol api.VolumeGetResp) {
 }
 
 func volumeInfoDisplay(vol api.VolumeGetResp) {
-
 	fmt.Println()
 	fmt.Println("Volume Name:", vol.Name)
 	fmt.Println("Type:", vol.Type)
 	fmt.Println("Volume ID:", vol.ID)
 	fmt.Println("State:", vol.State)
 	fmt.Println("Transport-type:", vol.Transport)
+	fmt.Println("Options:")
+	for key, value := range vol.Options {
+		fmt.Printf("    %s: %s\n", key, value)
+	}
 	volumeInfoDisplayNumbricks(vol)
 	for sIdx, subvol := range vol.Subvols {
 		for bIdx, brick := range subvol.Bricks {
@@ -281,8 +292,21 @@ func volumeInfoHandler2(cmd *cobra.Command, isInfo bool) error {
 		volname = cmd.Flags().Args()[0]
 	}
 	if volname == "" {
-		vols, err = client.Volumes("")
+		if flagCmdFilterKey == "" && flagCmdFilterValue == "" {
+			vols, err = client.Volumes("")
+		} else if flagCmdFilterKey != "" && flagCmdFilterValue == "" {
+			vols, err = client.Volumes("", map[string]string{"key": flagCmdFilterKey})
+		} else if flagCmdFilterKey == "" && flagCmdFilterValue != "" {
+			vols, err = client.Volumes("", map[string]string{"value": flagCmdFilterValue})
+		} else if flagCmdFilterKey != "" && flagCmdFilterValue != "" {
+			vols, err = client.Volumes("", map[string]string{"key": flagCmdFilterKey,
+				"value": flagCmdFilterValue,
+			})
+		}
 	} else {
+		if flagCmdFilterKey != "" || flagCmdFilterValue != "" {
+			return errors.New("Invalid command. Cannot give filter arguments when providing volname")
+		}
 		vols, err = client.Volumes(volname)
 	}
 
@@ -306,7 +330,7 @@ func volumeInfoHandler2(cmd *cobra.Command, isInfo bool) error {
 }
 
 var volumeInfoCmd = &cobra.Command{
-	Use:   "info",
+	Use:   "info [<volname> |--key <key>|--value <value>|--key <key> --value <value>]",
 	Short: helpVolumeInfoCmd,
 	Args:  cobra.RangeArgs(0, 1),
 	Run: func(cmd *cobra.Command, args []string) {
@@ -323,7 +347,7 @@ var volumeInfoCmd = &cobra.Command{
 }
 
 var volumeListCmd = &cobra.Command{
-	Use:   "list",
+	Use:   "list [--key <key>|--value <value>|--key <key> --value <value>]",
 	Short: helpVolumeListCmd,
 	Args:  cobra.RangeArgs(0, 1),
 	Run: func(cmd *cobra.Command, args []string) {
@@ -455,6 +479,6 @@ var volumeEditCmd = &cobra.Command{
 			}
 			failure("Failed to edit metadata", err, 1)
 		}
-		fmt.Printf("Metadata edit successfull\n")
+		fmt.Printf("Metadata edit successful\n")
 	},
 }