summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/features/unhashed-auto.t2
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c4
-rw-r--r--xlators/cluster/dht/src/dht-shared.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/features/unhashed-auto.t b/tests/features/unhashed-auto.t
index ddebd03299d..0a6bbfbb07d 100755
--- a/tests/features/unhashed-auto.t
+++ b/tests/features/unhashed-auto.t
@@ -114,7 +114,7 @@ TEST [ x"$new_hash" = x"00000001" ]
# Unset the option and check that newly created directories get 1 in the
# disk layout
-TEST $CLI volume reset $V0 cluster.lookup-optimize
+TEST $CLI volume set $V0 cluster.lookup-optimize off
TEST mkdir $M0/dir1
new_hash=$(get_xattr_hash $B0/${V0}1/dir1)
TEST [ x"$new_hash" = x"00000001" ]
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index b5906f5ec4e..f21a0201042 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -4542,7 +4542,9 @@ gf_defrag_start_crawl (void *data)
ret = syncop_setxattr (this, &loc, fix_layout, 0, NULL, NULL);
if (ret) {
- gf_log (this->name, GF_LOG_ERROR, "fix layout on %s failed",
+ gf_log (this->name, GF_LOG_ERROR,
+ "Failed to set commit hash on %s. "
+ "Rebalance cannot proceed.",
loc.path);
defrag->total_failures++;
ret = -1;
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
index 6b89fe797de..b5f790b111b 100644
--- a/xlators/cluster/dht/src/dht-shared.c
+++ b/xlators/cluster/dht/src/dht-shared.c
@@ -976,7 +976,7 @@ struct volume_options options[] = {
},
{ .key = {"lookup-optimize"},
.type = GF_OPTION_TYPE_BOOL,
- .default_value = "off",
+ .default_value = "on",
.description = "This option if set to ON enables the optimization "
"of -ve lookups, by not doing a lookup on non-hashed subvolumes for "
"files, in case the hashed subvolume does not return any result. "