cli/glusterd: Added support for dispersed volumes

Two new options have been added to the 'create' command of the cli
interface:

    disperse [<count>] redundancy <count>

Both are optional. A dispersed volume is created by specifying, at
least, one of them. If 'disperse' is missing or it's present but
'<count>' does not, the number of bricks enumerated in the command
line is taken as the disperse count.

If 'redundancy' is missing, the lowest optimal value is assumed. A
configuration is considered optimal (for most workloads) when the
disperse count - redundancy count is a power of 2. If the resulting
redundancy is 1, the volume is created normally, but if it's greater
than 1, a warning is shown to the user and he/she must answer yes/no
to continue volume creation. If there isn't any optimal value for
the given number of bricks, a warning is also shown and, if the user
accepts, a redundancy of 1 is used.

If 'redundancy' is specified and the resulting volume is not optimal,
another warning is shown to the user.

A distributed-disperse volume can be created using a number of bricks
multiple of the disperse count.

Change-Id: Iab93efbe78e905cdb91f54f3741599f7ea6645e4
BUG: 1118629
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>
Reviewed-on: http://review.gluster.org/7782
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

1 files changed, 41 insertions, 17 deletions

diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index b1b6c8275bc..43e696d56c5 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -362,7 +362,7 @@ cli_cmd_volume_create_cbk (struct cli_state *state, struct cli_cmd_word *word,
         if (!frame)
                 goto out;
 
-        ret = cli_cmd_volume_create_parse (words, wordcount, &options);
+        ret = cli_cmd_volume_create_parse (state, words, wordcount, &options);
 
         if (ret) {
                 cli_usage_out (word->pattern);
@@ -376,32 +376,55 @@ cli_cmd_volume_create_cbk (struct cli_state *state, struct cli_cmd_word *word,
                 goto out;
         }
         if ((type == GF_CLUSTER_TYPE_REPLICATE) ||
-            (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE)) {
-                if ((ret = dict_get_str (options, "bricks", &brick_list)) != 0) {
-                        gf_log ("cli", GF_LOG_ERROR, "Replica bricks check : "
-                                                     "Could not retrieve bricks list");
+            (type == GF_CLUSTER_TYPE_STRIPE_REPLICATE) ||
+            (type == GF_CLUSTER_TYPE_DISPERSE)) {
+                if ((ret = dict_get_str (options, "bricks",
+                                         &brick_list)) != 0) {
+                        gf_log ("cli", GF_LOG_ERROR, "Bricks check : Could "
+                                                     "not retrieve bricks "
+                                                     "list");
                         goto out;
                 }
-                if ((ret = dict_get_int32 (options, "count", &brick_count)) != 0) {
-                        gf_log ("cli", GF_LOG_ERROR, "Replica bricks check : "
-                                                     "Could not retrieve brick count");
+                if ((ret = dict_get_int32 (options, "count",
+                                           &brick_count)) != 0) {
+                        gf_log ("cli", GF_LOG_ERROR, "Bricks check : Could "
+                                                     "not retrieve brick "
+                                                     "count");
                         goto out;
                 }
-                if ((ret = dict_get_int32 (options, "replica-count", &sub_count)) != 0) {
-                        gf_log ("cli", GF_LOG_ERROR, "Replica bricks check : "
-                                                    "Could not retrieve replica count");
-                        goto out;
+
+                if (type != GF_CLUSTER_TYPE_DISPERSE) {
+                    if ((ret = dict_get_int32 (options, "replica-count",
+                                               &sub_count)) != 0) {
+                            gf_log ("cli", GF_LOG_ERROR, "Bricks check : "
+                                                         "Could not retrieve "
+                                                         "replica count");
+                            goto out;
+                    }
+                    gf_log ("cli", GF_LOG_INFO, "Replicate cluster type found."
+                                                " Checking brick order.");
+                } else {
+                    ret = dict_get_int32 (options, "disperse-count",
+                                          &sub_count);
+                    if (ret) {
+                            gf_log ("cli", GF_LOG_ERROR, "Bricks check : "
+                                                         "Could not retrieve "
+                                                         "disperse count");
+                            goto out;
+                    }
+                    gf_log ("cli", GF_LOG_INFO, "Disperse cluster type found. "
+                                                "Checking brick order.");
                 }
-                gf_log ("cli", GF_LOG_INFO, "Replicate cluster type found."
-                                            " Checking brick order.");
-                ret = cli_cmd_check_brick_order (state, brick_list, brick_count, sub_count);
+                ret = cli_cmd_check_brick_order (state, brick_list,
+                                                 brick_count, sub_count);
                 if (ret) {
-                        gf_log("cli", GF_LOG_INFO, "Not creating volume because of bad brick order");
+                        gf_log("cli", GF_LOG_INFO, "Not creating volume "
+                                                   "because of bad brick "
+                                                   "order");
                         goto out;
                 }
         }
 
-
         ret = dict_get_str (options, "transport", &trans_type);
         if (ret) {
                 gf_log("cli", GF_LOG_ERROR, "Unable to get transport type");
@@ -2328,6 +2351,7 @@ struct cli_cmd volume_cmds[] = {
           "list information of all volumes"},
 
         { "volume create <NEW-VOLNAME> [stripe <COUNT>] [replica <COUNT>] "
+          "[disperse [<COUNT>]] [redundancy <COUNT>] "
           "[transport <tcp|rdma|tcp,rdma>] <NEW-BRICK>"
 #ifdef HAVE_BD_XLATOR
           "?<vg_name>"