summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2018-04-02 09:11:06 +0530
committerN Balachandran <nbalacha@redhat.com>2018-04-02 09:12:11 +0530
commit7f0aadb0fcf85fe47d077d304f96ae68bb0b6ff3 (patch)
treebb6120bb22060505b2894122dcd48559ec21783b
parent5a1fcd26369e9877264dc3823269bfc70e943850 (diff)
cluster/dht: ENOSPC will not fail rebalance
ENOSPC returned by a file migration is no longer considered a rebalance failure. Change-Id: I21cf3a8acdc827bc478e138d6cb5db649d53a28c BUG: 1555161 Signed-off-by: N Balachandran <nbalacha@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 9da36ff9a29..6fd21ebaac8 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -2449,10 +2449,11 @@ dht_build_root_loc (inode_t *inode, loc_t *loc)
int32_t
gf_defrag_handle_migrate_error (int32_t op_errno, gf_defrag_info_t *defrag)
{
- /* if errno is not ENOSPC or ENOTCONN, we can still continue
+ /* if errno is not ENOTCONN, we can still continue
with rebalance process */
- if ((op_errno != ENOSPC) && (op_errno != ENOTCONN))
+ if (op_errno != ENOTCONN) {
return 1;
+ }
if (op_errno == ENOTCONN) {
/* Most probably mount point went missing (mostly due
@@ -2462,13 +2463,6 @@ gf_defrag_handle_migrate_error (int32_t op_errno, gf_defrag_info_t *defrag)
return -1;
}
- if (op_errno == ENOSPC) {
- /* rebalance process itself failed, may be
- remote brick went down, or write failed due to
- disk full etc etc.. */
- return 0;
- }
-
return 0;
}