From d1a4e534ba9283da9e75033f4a3a309d16176b24 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Thu, 16 Jun 2016 10:21:53 +0530 Subject: cli: fix crash in arbiter keyword parsing Backport of http://review.gluster.org/#/c/14738/ A negative case like `gluster volume create volname arbiter 3 /bricks{1..3}` must not crash. 'arbiter' keyword is valid only for (3 way) replica volumes. The .t that is added will crash and create a core *without* the fix when run but will still pass all TESTs. Since the regression framework fails the .t if it creates a core, we can consider it a valid test 'that fails without the fix'. Change-Id: Ie2d7ced66025ea3617d30f6f823b22401e6d2fde BUG: 1348055 Signed-off-by: Ravishankar N (cherry picked from commit b5c492dfea2d2e2075aa88d7153fba57b06e739d) Reviewed-on: http://review.gluster.org/14764 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Atin Mukherjee --- cli/src/cli-cmd-parser.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cli') diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index b062adfab0f..574cca1895b 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; -- cgit