andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: Copy brick port no. if brick is running

Browse Source 
Instead of relying on brickinfo->status, check if the brick
process is running before copying the brick port number.

Change-Id: I246465fa4cf4911da63a1c26bbb51cc4ed4630ac
BUG: 1175700
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/9297
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
This commit is contained in:
Avra Sengupta 2014-12-17 11:20:20 +00:00 committed by Krishnan Parthasarathi
parent 8484a88364
commit 81301d3b00
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -4574,21 +4574,34 @@ int32_t
glusterd_volinfo_copy_brick_portinfo (glusterd_volinfo_t *new_volinfo,
glusterd_volinfo_t *old_volinfo)
{
glusterd_brickinfo_t *new_brickinfo = NULL;
glusterd_brickinfo_t *old_brickinfo = NULL;
char pidfile[PATH_MAX+1] = {0,};
glusterd_brickinfo_t *new_brickinfo = NULL;
glusterd_brickinfo_t *old_brickinfo = NULL;
glusterd_conf_t *priv = NULL;
int ret = 0;
xlator_t *this = NULL;
int ret = 0;
GF_ASSERT (new_volinfo);
GF_ASSERT (old_volinfo);
this = THIS;
GF_ASSERT (this);
priv = this->private;
GF_ASSERT (priv);
if (_gf_false == glusterd_is_volume_started (new_volinfo))
goto out;
list_for_each_entry (new_brickinfo, &new_volinfo->bricks, brick_list) {
ret = glusterd_volume_brickinfo_get (new_brickinfo->uuid,
new_brickinfo->hostname,
new_brickinfo->path,
old_volinfo, &old_brickinfo);
if ((0 == ret) && glusterd_is_brick_started (old_brickinfo)) {
new_brickinfo->port = old_brickinfo->port;
if (ret == 0) {
GLUSTERD_GET_BRICK_PIDFILE (pidfile, old_volinfo,
old_brickinfo, priv);
if (gf_is_service_running (pidfile, NULL))
new_brickinfo->port = old_brickinfo->port;
}
}
out: