|
 |
7f4c2a |
From eedc3bf07a6ce161ef65e17459c2ce440b498f30 Mon Sep 17 00:00:00 2001
|
|
|
7f4c2a |
From: Gaurav Kumar Garg <ggarg@redhat.com>
|
|
|
7f4c2a |
Date: Thu, 21 May 2015 17:13:54 +0530
|
|
|
7f4c2a |
Subject: [PATCH 07/18] glusterd: do not show pid of brick in volume status if
|
|
|
7f4c2a |
brick is down.
|
|
|
7f4c2a |
|
|
|
7f4c2a |
glusterd is currently showing pid of brick in volume status if brick
|
|
|
7f4c2a |
goes down.
|
|
|
7f4c2a |
|
|
|
7f4c2a |
It should not show pid of brick if brick is down.
|
|
|
7f4c2a |
|
|
|
7f4c2a |
BUG: 1223715
|
|
|
7f4c2a |
Change-Id: I65fd5a20a8f60159a71e00914a72ece99168ed9c
|
|
|
7f4c2a |
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
|
|
|
7f4c2a |
upstream-review-url: Reviewed-on: http://review.gluster.org/11080
|
|
|
7f4c2a |
Reviewed-on: https://code.engineering.redhat.com/gerrit/50098
|
|
|
7f4c2a |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
7f4c2a |
Tested-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
7f4c2a |
---
|
|
|
7f4c2a |
xlators/mgmt/glusterd/src/glusterd-utils.c | 6 ++++--
|
|
|
7f4c2a |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
7f4c2a |
|
|
|
7f4c2a |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
7f4c2a |
index f90abc19..86b22f8 100644
|
|
|
7f4c2a |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
7f4c2a |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
7f4c2a |
@@ -5170,12 +5170,12 @@ glusterd_add_brick_to_dict (glusterd_volinfo_t *volinfo,
|
|
|
7f4c2a |
|
|
|
7f4c2a |
int ret = -1;
|
|
|
7f4c2a |
int32_t pid = -1;
|
|
|
7f4c2a |
- int32_t brick_online = -1;
|
|
|
7f4c2a |
char key[1024] = {0};
|
|
|
7f4c2a |
char base_key[1024] = {0};
|
|
|
7f4c2a |
char pidfile[PATH_MAX] = {0};
|
|
|
7f4c2a |
xlator_t *this = NULL;
|
|
|
7f4c2a |
glusterd_conf_t *priv = NULL;
|
|
|
7f4c2a |
+ gf_boolean_t brick_online = _gf_false;
|
|
|
7f4c2a |
|
|
|
7f4c2a |
GF_ASSERT (volinfo);
|
|
|
7f4c2a |
GF_ASSERT (brickinfo);
|
|
|
7f4c2a |
@@ -5230,7 +5230,9 @@ glusterd_add_brick_to_dict (glusterd_volinfo_t *volinfo,
|
|
|
7f4c2a |
|
|
|
7f4c2a |
GLUSTERD_GET_BRICK_PIDFILE (pidfile, volinfo, brickinfo, priv);
|
|
|
7f4c2a |
|
|
|
7f4c2a |
- brick_online = gf_is_service_running (pidfile, &pid;;
|
|
|
7f4c2a |
+ if (glusterd_is_brick_started (brickinfo)) {
|
|
|
7f4c2a |
+ brick_online = gf_is_service_running (pidfile, &pid;;
|
|
|
7f4c2a |
+ }
|
|
|
7f4c2a |
|
|
|
7f4c2a |
memset (key, 0, sizeof (key));
|
|
|
7f4c2a |
snprintf (key, sizeof (key), "%s.pid", base_key);
|
|
|
7f4c2a |
--
|
|
|
7f4c2a |
1.9.3
|
|
|
7f4c2a |
|