|
 |
e7a346 |
From f3982cf5bf3250ee29da3ea4477591c298780043 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Sunil Kumar Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
Date: Mon, 17 Dec 2018 16:37:21 +0530
|
|
|
e7a346 |
Subject: [PATCH 485/493] cluster/ec : Prevent volume create without redundant
|
|
|
e7a346 |
brick
|
|
|
e7a346 |
|
|
|
e7a346 |
Problem:
|
|
|
e7a346 |
EC volumes can be created without any redundant brick.
|
|
|
e7a346 |
|
|
|
e7a346 |
Solution:
|
|
|
e7a346 |
Updated the conditional check to avoid volume create
|
|
|
e7a346 |
without redundant brick.
|
|
|
e7a346 |
|
|
|
e7a346 |
>fixes: bz#1642448
|
|
|
e7a346 |
>Change-Id: I0cb334b1b9378d67fcb8abf793dbe312c3179c0b
|
|
|
e7a346 |
>Signed-off-by: Sunil Kumar Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
Upstream Patch: https://review.gluster.org/#/c/glusterfs/+/21478/
|
|
|
e7a346 |
|
|
|
e7a346 |
BUG: 1597252
|
|
|
e7a346 |
Change-Id: I0cb334b1b9378d67fcb8abf793dbe312c3179c0b
|
|
|
e7a346 |
Signed-off-by: Sunil Kumar Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/158910
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
cli/src/cli-cmd-parser.c | 6 +++---
|
|
|
e7a346 |
tests/basic/glusterd/disperse-create.t | 1 +
|
|
|
e7a346 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
|
|
|
e7a346 |
index 3745fb4..e790d79 100644
|
|
|
e7a346 |
--- a/cli/src/cli-cmd-parser.c
|
|
|
e7a346 |
+++ b/cli/src/cli-cmd-parser.c
|
|
|
e7a346 |
@@ -275,9 +275,9 @@ cli_cmd_create_disperse_check (struct cli_state *state, int *disperse,
|
|
|
e7a346 |
tmp = *disperse - *redundancy;
|
|
|
e7a346 |
}
|
|
|
e7a346 |
|
|
|
e7a346 |
- if (*redundancy > (*disperse - 1) / 2) {
|
|
|
e7a346 |
- cli_err ("redundancy must be less than %d for a "
|
|
|
e7a346 |
- "disperse %d volume",
|
|
|
e7a346 |
+ if ((*redundancy < 1) || (*redundancy > (*disperse - 1) / 2)) {
|
|
|
e7a346 |
+ cli_err ("redundancy must be greater than or equal to 1 and"
|
|
|
e7a346 |
+ " less than %d for a disperse %d volume",
|
|
|
e7a346 |
(*disperse + 1) / 2, *disperse);
|
|
|
e7a346 |
|
|
|
e7a346 |
return -1;
|
|
|
e7a346 |
diff --git a/tests/basic/glusterd/disperse-create.t b/tests/basic/glusterd/disperse-create.t
|
|
|
e7a346 |
index e5ce74c..5b3ed13 100644
|
|
|
e7a346 |
--- a/tests/basic/glusterd/disperse-create.t
|
|
|
e7a346 |
+++ b/tests/basic/glusterd/disperse-create.t
|
|
|
e7a346 |
@@ -48,6 +48,7 @@ TEST ! $CLI volume create $V0 redundancy 1 redundancy 1 $H0:$B0/b20 $H0:$B0/b21
|
|
|
e7a346 |
#Minimum counts test
|
|
|
e7a346 |
TEST ! $CLI volume create $V0 disperse 2 $H0:$B0/b20 $H0:$B0/b22
|
|
|
e7a346 |
TEST ! $CLI volume create $V0 disperse-data 1 redundancy 0 $H0:$B0/b20 $H0:$B0/b22
|
|
|
e7a346 |
+TEST ! $CLI volume create $V0 disperse 4 disperse-data 4 $H0:$B0/b20 $H0:$B0/b21 $H0:$B0/b23 $H0:$B0/b24
|
|
|
e7a346 |
TEST ! $CLI volume create $V0 redundancy 0 $H0:$B0/b20 $H0:$B0/b22
|
|
|
e7a346 |
|
|
|
e7a346 |
#Wrong count n != k+m
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|