diff options
| -rwxr-xr-x | tests/basic/tier/tier.t | 3 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/basic/tier/tier.t b/tests/basic/tier/tier.t index 3c01fb386ea..b3daae35843 100755 --- a/tests/basic/tier/tier.t +++ b/tests/basic/tier/tier.t @@ -73,6 +73,9 @@ TEST $CLI volume set $V0 features.ctr-enabled on #Not a tier volume TEST ! $CLI volume set $V0 cluster.tier-demote-frequency 4 +#testing bug #1228112, glusterd crashed when trying to detach-tier commit force on a non-tiered volume. +TEST ! $CLI volume detach-tier $V0 commit force + TEST $CLI volume attach-tier $V0 replica 2 $H0:$B0/${V0}$CACHE_BRICK_FIRST $H0:$B0/${V0}$CACHE_BRICK_LAST #Tier options expect non-negative value diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index c634689dd64..259d31a4a8c 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -6964,9 +6964,6 @@ unlock: conf->defrag = NULL; kill (getpid(), SIGTERM); } - } else { - GF_FREE (conf->defrag); - conf->defrag = NULL; } } } |