From 59fe175bc473db2a87ee8f40f220275da9e7b0ff Mon Sep 17 00:00:00 2001
From: Sakshi <sabansal@redhat.com>
Date: Fri, 5 Jun 2015 13:48:09 +0530
Subject: [PATCH 124/129] dht : Error value check before performing rebalance complete

Change-Id: I7a0cd288d16f27b887c7820162efdbe99a039d95
BUG: 1224115
Signed-off-by: Sakshi <sabansal@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/51121
Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
Tested-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
---
 xlators/cluster/dht/src/dht-inode-write.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/xlators/cluster/dht/src/dht-inode-write.c b/xlators/cluster/dht/src/dht-inode-write.c
index 85102a3..1846ece 100644
--- a/xlators/cluster/dht/src/dht-inode-write.c
+++ b/xlators/cluster/dht/src/dht-inode-write.c
@@ -29,21 +29,29 @@ dht_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 struct iatt *postbuf, dict_t *xdata)
 {
         dht_local_t *local = NULL;
+        call_frame_t *prev = NULL;
         int          ret   = -1;
         xlator_t    *subvol1 = NULL;
         xlator_t    *subvol2 = NULL;
 
-        if (op_ret == -1 && !dht_inode_missing(op_errno)) {
-                goto out;
-        }
-
         local = frame->local;
+        prev = cookie;
+
         if (!local) {
                 op_ret = -1;
                 op_errno = EINVAL;
                 goto out;
         }
 
+        if (op_ret == -1 && !dht_inode_missing(op_errno)) {
+                local->op_errno = op_errno;
+                local->op_ret = -1;
+                gf_msg_debug (this->name, 0,
+                              "subvolume %s returned -1 (%s)",
+                              prev->this->name, strerror (op_errno));
+                goto out;
+        }
+
         if (local->call_cnt != 1) {
                 /* preserve the modes of source */
                 if (local->stbuf.ia_blocks) {
@@ -57,7 +65,7 @@ dht_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         local->op_errno = op_errno;
         /* Phase 2 of migration */
-        if (IS_DHT_MIGRATION_PHASE2 (postbuf)) {
+        if ((op_ret == -1) || IS_DHT_MIGRATION_PHASE2 (postbuf)) {
                 ret = dht_rebalance_complete_check (this, frame);
                 if (!ret)
                         return 0;
-- 
1.7.1