volgen: volgen changes for glustershd

Fixes: #1111 and #1190
Signed-off-by: Aravinda VK <avishwan@redhat.com>

plugins/glustershd/actor.go

@@ -6,6 +6,7 @@ import (
 	"path"
 
 	"github.com/gluster/glusterd2/glusterd2/daemon"
+	"github.com/gluster/glusterd2/glusterd2/volgen"
 	"github.com/gluster/glusterd2/glusterd2/volume"
 	"github.com/gluster/glusterd2/glusterd2/xlator"
 	gderrors "github.com/gluster/glusterd2/pkg/errors"
@@ -48,7 +49,13 @@ func (actor *shdActor) Do(v *volume.Volinfo, key string, value string, volOp xla
 				return nil
 			}
 		}
-		err := daemon.Start(glustershDaemon, true, logger)
+
+		err = volgen.ClusterVolfileToFile(v, glustershDaemon.VolfileID, "glustershd")
+		if err != nil {
+			return err
+		}
+
+		err = daemon.Start(glustershDaemon, true, logger)
 		if err != nil && err != gderrors.ErrProcessAlreadyRunning {
 			return err
 		}
@@ -82,6 +89,10 @@ func (actor *shdActor) Do(v *volume.Volinfo, key string, value string, volOp xla
 			switch value {
 			case "on":
 				if isHealEnabled(v) {
+					err = volgen.ClusterVolfileToFile(v, glustershDaemon.VolfileID, "glustershd")
+					if err != nil {
+						return err
+					}
 					err = daemon.Start(glustershDaemon, true, logger)
 					if err != nil && err != gderrors.ErrProcessAlreadyRunning {
 						return err
@@ -144,6 +155,10 @@ func (actor *shdActor) Undo(v *volume.Volinfo, key string, value string, volOp x
 		}
 
 	case xlator.VolumeStop:
+		err = volgen.ClusterVolfileToFile(v, glustershDaemon.VolfileID, "glustershd")
+		if err != nil {
+			return err
+		}
 		err = daemon.Start(glustershDaemon, true, logger)
 		if err != nil && err != gderrors.ErrProcessAlreadyRunning {
 			return err
@@ -165,6 +180,10 @@ func (actor *shdActor) Undo(v *volume.Volinfo, key string, value string, volOp x
 			switch value {
 			case "off":
 				if isHealEnabled(v) {
+					err = volgen.ClusterVolfileToFile(v, glustershDaemon.VolfileID, "glustershd")
+					if err != nil {
+						return err
+					}
 					err = daemon.Start(glustershDaemon, true, logger)
 					if err != nil && err != gderrors.ErrProcessAlreadyRunning {
 						return err

plugins/glustershd/glustershd.go

@@ -22,6 +22,7 @@ type Glustershd struct {
 	args           []string
 	socketfilepath string
 	pidfilepath    string
+	VolfileID      string
 }
 
 // Name returns human-friendly name of the glustershd process. This is used for
@@ -37,17 +38,17 @@ func (shd *Glustershd) Path() string {
 
 // Args returns arguments to be passed to glustershd process during spawn.
 func (shd *Glustershd) Args() []string {
-	shost, _, _ := net.SplitHostPort(config.GetString("clientaddress"))
+	shost, sport, _ := net.SplitHostPort(config.GetString("clientaddress"))
 	if shost == "" {
 		shost = "localhost"
 	}
-	volFileID := "gluster/glustershd"
 
 	logFile := path.Join(config.GetString("logdir"), "glusterfs", "glustershd.log")
 
 	shd.args = []string{}
 	shd.args = append(shd.args, "-s", shost)
-	shd.args = append(shd.args, "--volfile-id", volFileID)
+	shd.args = append(shd.args, "--volfile-server-port", sport)
+	shd.args = append(shd.args, "--volfile-id", shd.VolfileID)
 	shd.args = append(shd.args, "-p", shd.PidFile())
 	shd.args = append(shd.args, "-l", logFile)
 	shd.args = append(shd.args, "-S", shd.SocketFile())
@@ -87,7 +88,7 @@ func newGlustershd() (*Glustershd, error) {
 	if e != nil {
 		return nil, e
 	}
-	glustershdObject := &Glustershd{binarypath: path}
+	glustershdObject := &Glustershd{binarypath: path, VolfileID: "gluster/glustershd"}
 	return glustershdObject, nil
 }