From 984ebffd03aaf6e1da9981b804d5a368e56150ee Mon Sep 17 00:00:00 2001
From: Ravishankar N <ravishankar@redhat.com>
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: 1348056
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
(cherry picked from commit b5c492dfea2d2e2075aa88d7153fba57b06e739d)
Reviewed-on: http://review.gluster.org/14765
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 cli/src/cli-cmd-parser.c      |  5 +++++
 tests/basic/afr/arbiter-cli.t | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 tests/basic/afr/arbiter-cli.t

diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 206acddaa83..0adc956bfdc 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -633,6 +633,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
-- 
cgit