diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-06-16 23:42:53 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-06-23 21:30:59 -0700 |
| commit | 89452c4db44966bb80601c73c3b835d002af9fd5 (patch) | |
| tree | b5cd35165617489ad545d5f26ac57bf6093e8355 /cli/src/cli-rpc-ops.c | |
| parent | c9854677fcd5a0a68e885cc18b6d9d6d92218f23 (diff) | |
gluster volume info: fix the output of 'stripe-replicated' volumes
also fix the glusterd-store to preserve the required information
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 3040 (need a way to create volumes with 'stripe+replicate' setup..)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3040
Diffstat (limited to 'cli/src/cli-rpc-ops.c')
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index cea112909..2c1a9f783 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -53,8 +53,10 @@ extern int connected; char *cli_volume_type[] = {"Distribute", "Stripe", "Replicate", + "Striped-Replicate (RAID 01)", "Distributed-Stripe", "Distributed-Replicate", + "Distributed-Striped-Replicate (RAID 01)", }; @@ -380,6 +382,7 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, int32_t type = 0; int32_t brick_count = 0; int32_t sub_count = 0; + int32_t stripe_count = 0; int32_t vol_type = 0; char *brick = NULL; int32_t j = 1; @@ -484,6 +487,11 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, if (ret) goto out; + snprintf (key, 256, "volume%d.stripe_count", i); + ret = dict_get_int32 (dict, key, &stripe_count); + if (ret) + goto out; + snprintf (key, 256, "volume%d.transport", i); ret = dict_get_int32 (dict, key, &transport); if (ret) @@ -491,23 +499,32 @@ gf_cli3_1_get_volume_cbk (struct rpc_req *req, struct iovec *iov, vol_type = type; - // Stripe - if ((type == 1) && (sub_count < brick_count)) - vol_type = 3; - - // Replicate - if ((type == 2) && (sub_count < brick_count)) - vol_type = 4; + // Distributed (stripe/replicate/raid01) setups + if ((type > 1) && ( sub_count < brick_count)) + vol_type = type + 3; cli_out ("Volume Name: %s", volname); cli_out ("Type: %s", cli_volume_type[vol_type]); cli_out ("Status: %s", cli_volume_status[status]); - if ((sub_count > 1) && (brick_count > sub_count)) - cli_out ("Number of Bricks: %d x %d = %d", - brick_count / sub_count, sub_count, - brick_count); - else - cli_out ("Number of Bricks: %d", brick_count); + if ((sub_count > 1) && (brick_count > sub_count)) { + if (!stripe_count) + cli_out ("Number of Bricks: %d x %d = %d", + brick_count / sub_count, sub_count, + brick_count); + else + cli_out ("Number of Bricks: %d x %d x %d = %d", + brick_count / sub_count, stripe_count, + sub_count / stripe_count, brick_count); + } else { + if (!stripe_count) + cli_out ("Number of Bricks: %d", + brick_count); + else + cli_out ("Number of Bricks: %d x %d = %d", + stripe_count, + (brick_count / stripe_count), + brick_count); + } cli_out ("Transport-type: %s", ((transport == 0)?"tcp": |