andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DHT: Wrong error handling in gf_defrag_migrate_data

Browse Source 
Problem:
         Because of the condition (err = op_errno), err was set to
zero always and ENOSPC error will be logged always. "dht_check_free_
space" was returning 1 and it was mapped to EPERM in "rebalance_task
_completion".

Solution: Changed the return value in dht_check_free_space to -1
as in rebalance_task_completion op_ret value -1 is mapped to ENOSPC.

And fixed the wrong error condition after syncop_setxattr in
gf_defrag_migrate_data.

Change-Id: I474ea1bef3b1e34c89814ed0091dd02bd5b63737
BUG: 1054703
Signed-off-by: Susant Palai <spalai@redhat.com>
Reviewed-on: http://review.gluster.org/6727
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Susant Palai 2014-02-19 05:47:07 +00:00 committed by Vijay Bellur
parent 847a481ceb
commit deaaaec82a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xlators/cluster/dht/src/dht-rebalance.c
View File

@ -454,7 +454,7 @@ __dht_check_free_space (xlator_t *to, xlator_t *from, loc_t *loc,
/* this is not a 'failure', but we don't want to
consider this as 'success' too :-/ */
ret = 1;
ret = -1;
goto out;
}
}
@ -465,7 +465,7 @@ check_avail_space:
"data movement attempted from node (%s) with "
"to node (%s) which does not have required free space"
" for %s", from->name, to->name, loc->path);
ret = 1;
ret = -1;
goto out;
}
@ -1213,7 +1213,6 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
struct timeval end = {0,};
double elapsed = {0,};
struct timeval start = {0,};
int32_t err = 0;
int loglevel = GF_LOG_TRACE;
gf_log (this->name, GF_LOG_INFO, "migrate data called on %s",
@ -1380,11 +1379,11 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
ret = syncop_setxattr (this, &entry_loc, migrate_data,
0);
if (ret) {
err = op_errno;
if (ret < 0) {
op_errno = -ret;
/* errno is overloaded. See
* rebalance_task_completion () */
if (err != ENOSPC) {
if (op_errno == ENOSPC) {
gf_log (this->name, GF_LOG_DEBUG,
"migrate-data skipped for %s"
" due to space constraints",
@ -1396,10 +1395,7 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
entry_loc.path);
defrag->total_failures +=1;
}
}
if (ret < 0) {
op_errno = -ret;
ret = gf_defrag_handle_migrate_error (op_errno,
defrag);
@ -1412,6 +1408,11 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
continue;
else if (ret == -1)
goto out;
} else if (ret > 0) {
gf_log (this->name, GF_LOG_ERROR,
"migrate-data failed for %s",
entry_loc.path);
defrag->total_failures +=1;
}
LOCK (&defrag->lock);