diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-04-16 17:45:04 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-04-28 01:55:25 -0700 |
| commit | 00a74ad99ec3ee2090aff0849ab95458941aaaec (patch) | |
| tree | 7eb2620debc00f5f7187753240bf3a4b1e554925 | |
| parent | 3cce15950d6bdf426751f3b2dc91c72ba55cc036 (diff) | |
cli: fix vol_type in volume info xml
xml parsing of voltype should be inline with the cli
Backport of http://review.gluster.org/10271
Change-Id: I41ddddac00d07f03b56a041e1c3f5a132fbd7393
BUG: 1215517
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/10271
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
(cherry picked from commit 4c3724f195240e40994b71add255f85ee1b025fb)
Reviewed-on: http://review.gluster.org/10396
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 9 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 2 | ||||
| -rw-r--r-- | cli/src/cli-xml-output.c | 6 | ||||
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.x | 3 |
4 files changed, 16 insertions, 4 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index a8e09a46631..e9c8dfa352c 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -372,6 +372,9 @@ cli_validate_disperse_volume (char *word, gf1_cluster_type type, cli_err ("replicated-dispersed volume is not " "supported"); goto out; + default: + cli_err ("Invalid type given"); + break; } out: return ret; @@ -509,6 +512,9 @@ cli_cmd_volume_create_parse (struct cli_state *state, const char **words, cli_err ("replicated-dispersed volume is not " "supported"); goto out; + default: + cli_err ("Invalid type given"); + goto out; } if (wordcount < (index+2)) { @@ -567,6 +573,9 @@ cli_cmd_volume_create_parse (struct cli_state *state, const char **words, cli_err ("striped-tier volume is not " "supported"); goto out; + default: + cli_err ("Invalid type given"); + goto out; } if (wordcount < (index + 2)) { ret = -1; diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 9d9239ca7a7..0e82afbf921 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -741,7 +741,7 @@ xml_output: // Distributed (stripe/replicate/stripe-replica) setups if ((type != GF_CLUSTER_TYPE_TIER) && (type > 0) && (dist_count < brick_count)) - vol_type = type + 5; + vol_type = type + GF_CLUSTER_TYPE_MAX - 1; cli_out ("Volume Name: %s", volname); cli_out ("Type: %s", cli_vol_type_str[vol_type]); diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index e5afe1b427d..cbb4c1f58e7 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2687,8 +2687,10 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict) /* For Distributed-(stripe,replicate,stipe-replicate,disperse) types */ - if ((type > 0) && (dist_count < brick_count)) - type += 4; + if ((type != GF_CLUSTER_TYPE_TIER) && (type > 0) && + (dist_count < brick_count)) + type = type + GF_CLUSTER_TYPE_MAX - 1; + ret = xmlTextWriterWriteFormatElement (local->writer, (xmlChar *)"type", "%d", type); diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index 72581b0c5d5..922f22613eb 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -27,7 +27,8 @@ GF_CLUSTER_TYPE_REPLICATE, GF_CLUSTER_TYPE_STRIPE_REPLICATE, GF_CLUSTER_TYPE_DISPERSE, - GF_CLUSTER_TYPE_TIER + GF_CLUSTER_TYPE_TIER, + GF_CLUSTER_TYPE_MAX }; enum gf1_cli_replace_op { |