diff options
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 5 | ||||
| -rw-r--r-- | xlators/cluster/stripe/src/stripe.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 1b140dbb8b5..ee0631689ee 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -2359,7 +2359,7 @@ 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 with rebalance process */ - if ((op_errno != ENOSPC) || (op_errno != ENOTCONN)) + if ((op_errno != ENOSPC) && (op_errno != ENOTCONN)) return 1; if (op_errno == ENOTCONN) { @@ -2374,8 +2374,7 @@ gf_defrag_handle_migrate_error (int32_t op_errno, gf_defrag_info_t *defrag) /* rebalance process itself failed, may be remote brick went down, or write failed due to disk full etc etc.. */ - defrag->defrag_status = GF_DEFRAG_STATUS_FAILED; - return -1; + return 0; } return 0; diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index ae175faf811..fb10fd2a302 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -186,7 +186,7 @@ stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, callcnt = --local->call_count; if (op_ret == -1) { - if ((op_errno != ENOENT) || (op_errno != ESTALE)) + if ((op_errno != ENOENT) && (op_errno != ESTALE)) gf_log (this->name, GF_LOG_DEBUG, "%s returned error %s", prev->this->name, |