diff options
| author | Vijay Bellur <vijay@gluster.com> | 2012-03-31 20:43:12 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-01 05:53:42 -0700 |
| commit | c2dd1510e18e4c91d54ce4de91ecd47b408524dd (patch) | |
| tree | f74e5807c970857137e637efdfb3938af7f2bdea /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 778c8d616ba2e9b47cafbbe95dbec7f2eb788302 (diff) | |
mgmt/glusterd: Improvements for volume heal CLI.
1) Brought in a CLI improvement for volume heal cmd when it fails
before initiating a transaction.
2) Minor improvements in UI messages related to self-heal-daemon.
Change-Id: I983c1e54b48f2efe8793fa5b00fa50df2067683b
BUG: 807261
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Reviewed-on: http://review.gluster.com/3057
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pranithk@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 9f1dba151b6..ec191e4f930 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1579,29 +1579,26 @@ _add_volinfo_dict_to_prdict (dict_t *this, char *key, data_t *value, void *data) } int32_t -glusterd_add_bricks_hname_path_to_dict (dict_t *dict) +glusterd_add_bricks_hname_path_to_dict (dict_t *dict, + glusterd_volinfo_t *volinfo) { - char *volname = NULL; - glusterd_volinfo_t *volinfo = NULL; glusterd_brickinfo_t *brickinfo = NULL; int ret = 0; char key[256] = {0}; int index = 0; - ret = dict_get_str (dict, "volname", &volname); - if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to get volume name"); - goto out; - } - ret = glusterd_volinfo_find (volname, &volinfo); - if (ret) - goto out; list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { snprintf (key, sizeof (key), "%d-hostname", index); ret = dict_set_str (dict, key, brickinfo->hostname); + if (ret) + goto out; + snprintf (key, sizeof (key), "%d-path", index); ret = dict_set_str (dict, key, brickinfo->path); + if (ret) + goto out; + index++; } out: |