diff options
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 5 | ||||
| -rw-r--r-- | tests/basic/afr/arbiter-cli.t | 25 |
2 files changed, 30 insertions, 0 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index f60e5fb04a0..e8c4ea7d082 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -628,6 +628,11 @@ cli_cmd_volume_create_parse (struct cli_state *state, const char **words, goto out; index += ret; type = GF_CLUSTER_TYPE_DISPERSE; + } else if ((strcmp (w, "arbiter") == 0)) { + cli_err ("arbiter option must be preceded by replica " + "option."); + ret = -1; + goto out; } else { GF_ASSERT (!"opword mismatch"); ret = -1; diff --git a/tests/basic/afr/arbiter-cli.t b/tests/basic/afr/arbiter-cli.t new file mode 100644 index 00000000000..2806b5a376b --- /dev/null +++ b/tests/basic/afr/arbiter-cli.t @@ -0,0 +1,25 @@ +#!/bin/bash + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc +. $(dirname $0)/../../afr.rc +cleanup; + +# Negative test cases for arbiter volume creation should not crash. + +TEST glusterd; +TEST pidof glusterd + +# No replica count. +TEST ! $CLI volume create $V0 arbiter 3 $H0:$B0/${V0}{0,1,2} + +# replica count given after arbiter count. +TEST ! $CLI volume create $V0 arbiter 1 replica 3 $H0:$B0/${V0}{0,1,2} + +#Incorrect values for replica and arbiter count. +TEST ! $CLI volume create $V0 replica 2 arbiter 1 $H0:$B0/${V0}{0,1,2} +TEST ! $CLI volume create $V0 replica 3 arbiter 2 $H0:$B0/${V0}{0,1,2} + +# Only permissible value is replica=3 and arbiter=1. +TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/${V0}{0,1,2} +cleanup |