diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 17 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 3 | 
2 files changed, 19 insertions, 1 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 6b2d6dfe7da..b062adfab0f 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -1583,6 +1583,7 @@ cli_cmd_volume_add_brick_parse (const char **words, int wordcount,          char    *opwords_cl[] = { "replica", "stripe", NULL };          gf1_cluster_type type = GF_CLUSTER_TYPE_NONE;          int     count = 1; +        int     arbiter_count = 0;          char    *w = NULL;          int     index;          gf_boolean_t is_force = _gf_false; @@ -1635,6 +1636,22 @@ cli_cmd_volume_add_brick_parse (const char **words, int wordcount,                  if (ret)                          goto out;                  index = 5; +                if (words[index] && !strcmp (words[index], "arbiter")) { +                        arbiter_count = strtol (words[6], NULL, 0); +                        if (arbiter_count != 1 || count != 3) { +                                cli_err ("For arbiter configuration, replica " +                                         "count must be 3 and arbiter count " +                                         "must be 1. The 3rd brick of the " +                                         "replica will be the arbiter"); +                                ret = -1; +                                goto out; +                        } +                        ret = dict_set_int32 (dict, "arbiter-count", +                                              arbiter_count); +                        if (ret) +                                goto out; +                        index = 7; +                }          } else if ((strcmp (w, "stripe")) == 0) {                  type = GF_CLUSTER_TYPE_STRIPE;                  count = strtol (words[4], NULL, 0); diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index bc4f42c5967..689eba6d281 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -2586,7 +2586,8 @@ struct cli_cmd volume_cmds[] = {            "{start|stop|commit} [force]"},  #endif -        { "volume add-brick <VOLNAME> [<stripe|replica> <COUNT>] <NEW-BRICK> ... [force]", +        { "volume add-brick <VOLNAME> [<stripe|replica> <COUNT> " +          "[arbiter <COUNT>]] <NEW-BRICK> ... [force]",            cli_cmd_volume_add_brick_cbk,            "add brick to volume <VOLNAME>"},  | 
