From c375f25b3e305cef2ab020866a10f26a7fbf1957 Mon Sep 17 00:00:00 2001 From: Susant Palai Date: Mon, 16 Mar 2020 11:39:56 +0530 Subject: dht: gf_defrag_process_dir is called even if gf_defrag_fix_layout has failed Currently even though gf_defrag_fix_layout fails with ENOENT or ESTALE, a subsequent call is made to gf_defrag_process_dir leading to rebalance failure. fixes: #1102 Change-Id: Ib0c309fd78e89a000fed3feb4bbe2c5b48e61478 Signed-off-by: Susant Palai --- xlators/cluster/dht/src/dht-rebalance.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 29eb3803cf1..abe2afae5dc 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -3951,6 +3951,7 @@ gf_defrag_fix_layout(xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc, defrag->total_failures++; } ret = 0; + goto out; } else { gf_msg(this->name, GF_LOG_ERROR, -ret, DHT_MSG_LAYOUT_FIX_FAILED, "Setxattr failed for %s", loc->path); -- cgit