diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 7 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 28 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 4 |
3 files changed, 37 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index a0bf409d872..9002ef55b03 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -5335,7 +5335,9 @@ glusterd_get_state(rpcsvc_request_t *req, dict_t *dict) char vol_status_str[STATUS_STRLEN] = { 0, }; - + char brick_status_str[STATUS_STRLEN] = { + 0, + }; this = THIS; GF_VALIDATE_OR_GOTO(THIS->name, this, out); @@ -5585,8 +5587,9 @@ glusterd_get_state(rpcsvc_request_t *req, dict_t *dict) brickinfo->rdma_port); fprintf(fp, "Volume%d.Brick%d.port_registered: %d\n", count_bkp, count, brickinfo->port_registered); + glusterd_brick_get_status_str(brickinfo, brick_status_str); fprintf(fp, "Volume%d.Brick%d.status: %s\n", count_bkp, count, - brickinfo->status ? "Started" : "Stopped"); + brick_status_str); ret = sys_statvfs(brickinfo->path, &brickstat); if (ret) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 87f924a6617..f8b6f8fa096 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -13442,6 +13442,34 @@ out: return ret; } +void +glusterd_brick_get_status_str(glusterd_brickinfo_t *brickinfo, char *status_str) +{ + GF_VALIDATE_OR_GOTO(THIS->name, brickinfo, out); + GF_VALIDATE_OR_GOTO(THIS->name, status_str, out); + + switch (brickinfo->status) { + case GF_BRICK_STOPPED: + sprintf(status_str, "%s", "Stopped"); + break; + case GF_BRICK_STARTED: + sprintf(status_str, "%s", "Started"); + break; + case GF_BRICK_STARTING: + sprintf(status_str, "%s", "Starting"); + break; + case GF_BRICK_STOPPING: + sprintf(status_str, "%s", "Stopping"); + break; + default: + sprintf(status_str, "%s", "None"); + break; + } + +out: + return; +} + int glusterd_volume_get_transport_type_str(glusterd_volinfo_t *volinfo, char *transport_type_str) diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 2312d426051..ed117e02267 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -761,6 +761,10 @@ glusterd_volume_get_type_str(glusterd_volinfo_t *volinfo, char **vol_type_str); int glusterd_volume_get_status_str(glusterd_volinfo_t *volinfo, char *status_str); +void +glusterd_brick_get_status_str(glusterd_brickinfo_t *brickinfo, + char *status_str); + int glusterd_volume_get_transport_type_str(glusterd_volinfo_t *volinfo, char *transport_type_str); |