diff options
| author | Vijaikumar M <vmallika@redhat.com> | 2014-05-19 13:09:07 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2014-05-29 23:59:58 -0700 |
| commit | 7b96fd92de79f367bfa8591becdb30340a4a26e7 (patch) | |
| tree | adfd692f8a675a64a4ef4cbb29f77001cebdf1d8 /cli | |
| parent | ac43be9d9c1925a5fddf21ba2061f414e53140a8 (diff) | |
cli: 'Snapshot Volume: yes/no' for volume info needs to be removed
With initial design where the snap volume used to be displayed in
gluster volume info,
we used "Snap Volume: yes/on" to distinguish the volume whether its a
snap volume or the original volume.
But with new design the snap volumes are not listed in the volume info,
hence this entry (snap volume:) doesn't make sense to show.
Change-Id: Ic5b9948bf4ef74e89a611742c74a8989cb406866
BUG: 1098910
Signed-off-by: Vijaikumar M <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/7794
Reviewed-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-by: Sachin Pandit <spandit@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 12 | ||||
| -rw-r--r-- | cli/src/cli-xml-output.c | 13 |
2 files changed, 0 insertions, 25 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index bdde185cca5..9312f15dc20 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -510,9 +510,6 @@ gf_cli_get_volume_cbk (struct rpc_req *req, struct iovec *iov, gf_cli_rsp rsp = {0}; char *caps = NULL; int k __attribute__((unused)) = 0; - /* snap_volume variable helps in showing whether a volume is a normal - * volume or a volume for the snapshot */ - int32_t snap_volume = 0; if (-1 == req->rpc_status) goto out; @@ -634,11 +631,6 @@ xml_output: if (ret) goto out; - snprintf (key, sizeof (key), "volume%d.snap_volume", i); - ret = dict_get_int32 (dict, key, &snap_volume); - if (ret) - goto out; - snprintf (key, 256, "volume%d.brick_count", i); ret = dict_get_int32 (dict, key, &brick_count); if (ret) @@ -679,10 +671,6 @@ xml_output: cli_out ("Type: %s", cli_vol_type_str[vol_type]); cli_out ("Volume ID: %s", volume_id_str); cli_out ("Status: %s", cli_vol_status_str[status]); - if (snap_volume) - cli_out ("Snap Volume: %s", "yes"); - else - cli_out ("Snap Volume: %s", "no"); #ifdef HAVE_BD_XLATOR k = 0; diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 5434dd4069a..b16c238f7fc 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2535,7 +2535,6 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict) int j = 1; char *caps = NULL; int k __attribute__((unused)) = 0; - char *snap_volume = NULL; ret = dict_get_int32 (dict, "count", &count); if (ret) @@ -2577,18 +2576,6 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict) "%d", status); XML_RET_CHECK_AND_GOTO (ret, out); - memset (key, 0, sizeof (key)); - snprintf (key, sizeof (key), "volume%d.snap_volume", i); - ret = dict_get_str (dict, key, &snap_volume); - if (ret) - goto out; - if (snap_volume) { - ret = xmlTextWriterWriteFormatElement (local->writer, - (xmlChar *)"snapVol", - "%s", snap_volume); - XML_RET_CHECK_AND_GOTO (ret, out); - } - ret =xmlTextWriterWriteFormatElement (local->writer, (xmlChar *)"statusStr", "%s", cli_vol_status_str[status]); |