andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cluster/afr: Empty string should not be default option val

Browse Source 
Glusterd does not allow empty string as default value. Changed
afr option values to disallow empty string as value.

Change-Id: I92a2d658907dbc6101e1139dd91f548acb5506f5
BUG: 859927
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/4271
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Pranith Kumar K 2012-12-05 12:20:28 +05:30 committed by Anand Avati
parent ddfef121a2
commit 128c8ceebb
4 changed files with 75 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tests/bugs/859927/repl.t Executable file
View File

@ -0,0 +1,69 @@
#!/bin/bash
. $(dirname $0)/../../include.rc
. $(dirname $0)/../../volume.rc
cleanup;
TEST glusterd;
TEST pidof glusterd
#Tests for data-self-heal-algorithm option
function create_setup_for_self_heal {
file=$1
kill_brick $V0 $H0 $B0/${V0}1
dd of=$file if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
$CLI volume start $V0 force
}
function test_write {
dd of=$M0/a if=/dev/urandom bs=1k count=1 2>&1 > /dev/null
}
TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
TEST $CLI volume set $V0 cluster.self-heal-daemon off
TEST $CLI volume set $V0 performance.stat-prefetch off
TEST $CLI volume set $V0 client-log-level DEBUG
TEST $CLI volume set $V0 cluster.background-self-heal-count 0
TEST $CLI volume start $V0
TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id=$V0 $M0;
touch $M0/a
TEST $CLI volume set $V0 cluster.data-self-heal-algorithm full
EXPECT full volume_option $V0 cluster.data-self-heal-algorithm
create_setup_for_self_heal $M0/a
EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
ls -l $file 2>&1 > /dev/null
TEST cmp $B0/${V0}1/a $B0/${V0}2/a
TEST $CLI volume set $V0 cluster.data-self-heal-algorithm diff
EXPECT diff volume_option $V0 cluster.data-self-heal-algorithm
create_setup_for_self_heal $M0/a
EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
ls -l $file 2>&1 > /dev/null
TEST cmp $B0/${V0}1/a $B0/${V0}2/a
TEST $CLI volume reset $V0 cluster.data-self-heal-algorithm
create_setup_for_self_heal $M0/a
EXPECT_WITHIN 20 "1" afr_child_up_status $V0 0
ls -l $file 2>&1 > /dev/null
TEST cmp $B0/${V0}1/a $B0/${V0}2/a
TEST ! $CLI volume set $V0 cluster.data-self-heal-algorithm ""
#Tests for quorum-type option
TEST ! $CLI volume set $V0 cluster.quorum-type ""
TEST $CLI volume set $V0 cluster.quorum-type fixed
EXPECT fixed volume_option $V0 cluster.quorum-type
TEST $CLI volume set $V0 cluster.quorum-count 2
kill_brick $V0 $H0 $B0/${V0}1
TEST ! test_write
TEST $CLI volume set $V0 cluster.quorum-type auto
EXPECT auto volume_option $V0 cluster.quorum-type
TEST ! test_write
TEST $CLI volume set $V0 cluster.quorum-type none
EXPECT none volume_option $V0 cluster.quorum-type
TEST test_write
TEST $CLI volume reset $V0 cluster.quorum-type
TEST test_write
cleanup;

4
xlators/cluster/afr/src/afr-self-heal-data.c
View File

@ -412,6 +412,9 @@ sh_algo_from_name (xlator_t *this, char *name)
{
int i = 0;
if (name == NULL)
goto out;
while (afr_self_heal_algorithms[i].name) {
if (!strcmp (name, afr_self_heal_algorithms[i].name)) {
return &afr_self_heal_algorithms[i];
@ -420,6 +423,7 @@ sh_algo_from_name (xlator_t *this, char *name)
i++;
}
out:
return NULL;
}

5
xlators/cluster/afr/src/afr.c
View File

@ -596,7 +596,6 @@ struct volume_options options[] = {
},
{ .key = {"data-self-heal-algorithm"},
.type = GF_OPTION_TYPE_STR,
.default_value = "",
.description = "Select between \"full\", \"diff\". The "
"\"full\" algorithm copies the entire file from "
"source to sink. The \"diff\" algorithm copies to "
@ -608,7 +607,7 @@ struct volume_options options[] = {
"about the same as page size the entire file will "
"be read and written i.e \"full\" algo, "
"otherwise \"diff\" algo is chosen.",
.value = { "diff", "full", "" }
.value = { "diff", "full"}
},
{ .key = {"data-self-heal-window-size"},
.type = GF_OPTION_TYPE_INT,
@ -714,7 +713,7 @@ struct volume_options options[] = {
},
{ .key = {"quorum-type"},
.type = GF_OPTION_TYPE_STR,
.value = { "none", "auto", "fixed", "" },
.value = { "none", "auto", "fixed"},
.default_value = "none",
.description = "If value is \"fixed\" only allow writes if "
"quorum-count bricks are present. If value is "

2
xlators/cluster/afr/src/pump.c
View File

@ -2437,8 +2437,6 @@ init (xlator_t *this)
priv->metadata_self_heal = 1;
priv->entry_self_heal = 1;
priv->data_self_heal_algorithm = "";
priv->data_self_heal_window_size = 16;
priv->data_change_log = 1;