From 64442122958011a3e7e73c5d205f37ac0da46736 Mon Sep 17 00:00:00 2001 From: Susant Palai Date: Wed, 9 Nov 2016 16:39:44 +0530 Subject: dht/rebalance: update op_errno for rebalance failures function "rebalance_task_completion" did not honor returned values other than -1 and 1. This led to ignoring errno e.g in the current bug, ENOTSUP returned by __is_file_migratable and it returned EINVAL(op_errno initialized) to it's caller leading to failure messages logged in ERROR level. Change-Id: I45549fba35c72b278539269b750768fd89e0faf2 BUG: 1393338 Signed-off-by: Susant Palai Reviewed-on: https://review.gluster.org/15810 Smoke: Gluster Build System Tested-by: Raghavendra G NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra G --- xlators/cluster/dht/src/dht-rebalance.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 4f422560449..bc6e983cd0a 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -1929,15 +1929,16 @@ rebalance_task_completion (int op_ret, call_frame_t *sync_frame, void *data) no space to migrate-data */ op_errno = ENOSPC; - } - - if (op_ret == 1) { + } else if (op_ret == 1) { /* migration didn't happen, but is not a failure, let the user understand that he doesn't have permission to migrate the file. */ op_ret = -1; op_errno = EPERM; + } else if (op_ret != 0) { + op_errno = -op_ret; + op_ret = -1; } DHT_STACK_UNWIND (setxattr, sync_frame, op_ret, op_errno, NULL); -- cgit