diff options
| author | Raghavendra Bhat <raghavendrabhat@gluster.com> | 2010-07-26 02:25:09 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-27 01:19:55 -0700 |
| commit | 470127fba6ca05671bd6b2ef9c187877711bf6cb (patch) | |
| tree | 054afd8785dd7f72bc3b99e11bd174300fead556 | |
| parent | a5534cc60911ca914111710e9faa3376b198c8e3 (diff) | |
Changes in pidfile format for start and stop volumes
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1217 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1217
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 7 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 3010f6646..060f957e8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -851,6 +851,7 @@ glusterd_op_stop_volume (gd1_mgmt_stage_op_req *req) glusterd_volinfo_t *volinfo = NULL; glusterd_brickinfo_t *brickinfo = NULL; xlator_t *this = NULL; + int32_t mybrick = 0; GF_ASSERT (req); @@ -872,12 +873,13 @@ glusterd_op_stop_volume (gd1_mgmt_stage_op_req *req) " for brick %s:%s", brickinfo->hostname, brickinfo->path); ret = glusterd_volume_stop_glusterfs - (volinfo, brickinfo); + (volinfo, brickinfo, mybrick); if (ret) { gf_log ("", GF_LOG_ERROR, "Unable to stop " "glusterfs, ret: %d", ret); goto out; } + mybrick++; } } diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 7c8a67ec3..fb76d1f03 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -701,7 +701,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, goto out; } - GLUSTERD_GET_BRICK_PIDFILE (pidfile, path, brickinfo->hostname); + GLUSTERD_GET_BRICK_PIDFILE (pidfile, path, brickinfo->hostname, count); snprintf (volfile, PATH_MAX, "%s/%s-%s-%d.vol", path, brickinfo->hostname, volinfo->volname, count); snprintf (cmd_str, 8192, "glusterfs -f %s -p %s", volfile, pidfile); @@ -713,7 +713,8 @@ out: int32_t glusterd_volume_stop_glusterfs (glusterd_volinfo_t *volinfo, - glusterd_brickinfo_t *brickinfo) + glusterd_brickinfo_t *brickinfo, + int32_t count) { int32_t ret = -1; xlator_t *this = NULL; @@ -732,7 +733,7 @@ glusterd_volume_stop_glusterfs (glusterd_volinfo_t *volinfo, priv = this->private; GLUSTERD_GET_VOLUME_DIR (path, volinfo, priv); - GLUSTERD_GET_BRICK_PIDFILE (pidfile, path, brickinfo->hostname); + GLUSTERD_GET_BRICK_PIDFILE (pidfile, path, brickinfo->hostname, count); file = fopen (pidfile, "r+"); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 041ecca67..39a0cdb19 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -100,7 +100,8 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo, int32_t glusterd_volume_stop_glusterfs (glusterd_volinfo_t *volinfo, - glusterd_brickinfo_t *brickinfo); + glusterd_brickinfo_t *brickinfo, + int32_t count); int32_t glusterd_volinfo_delete (glusterd_volinfo_t *volinfo); diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index f140bd9f7..5fccc0199 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -92,8 +92,8 @@ typedef ssize_t (*gd_serialize_t) (struct iovec outmsg, void *args); snprintf (path, PATH_MAX, "%s/vols/%s", priv->workdir,\ volinfo->volname); -#define GLUSTERD_GET_BRICK_PIDFILE(pidfile, volpath, hostname)\ - snprintf (pidfile, PATH_MAX, "%s/run/%s.pid", volpath, hostname); +#define GLUSTERD_GET_BRICK_PIDFILE(pidfile, volpath, hostname, count) \ + snprintf (pidfile, PATH_MAX, "%s/run/%s-%d.pid", volpath, hostname, count); int glusterd_probe_begin (rpcsvc_request_t *req, const char *hoststr, int port); |