cluster/afr: Do self-heal on unopened fds.

This patch completes the previous patch for self-heal of
open fds in replicate.

If an fd was never opened on a subvolume, we remember that
and do the open after we've done self-heal on that fd.

Signed-off-by: Vikas Gorur <vikas@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 170 (Auto-heal fails on files that are open()-ed/mmap()-ed)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=170

1 files changed, 37 insertions, 4 deletions

diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c
index 94f0972a1fc..1b43c6d81fc 100644
--- a/xlators/cluster/afr/src/afr-transaction.c
+++ b/xlators/cluster/afr/src/afr-transaction.c
@@ -1201,8 +1201,13 @@ int afr_lock_rec (call_frame_t *frame, xlator_t *this, int child_index)
 	afr_local_t *   local = NULL;
 	afr_private_t * priv  = NULL;
 
+        uint64_t      ctx;
+        afr_fd_ctx_t *fd_ctx;
+
 	struct flock flock;
 
+        int ret = 0;
+
 	loc_t * lower  = NULL;
 	loc_t * higher = NULL;
 
@@ -1216,10 +1221,38 @@ int afr_lock_rec (call_frame_t *frame, xlator_t *this, int child_index)
 	flock.l_len   = local->transaction.len;
 	flock.l_type  = F_WRLCK;
 
-	/* skip over children that are down */
-	while ((child_index < priv->child_count)
-	       && !local->child_up[child_index])
-		child_index++;
+        if (local->fd) {
+                ret = fd_ctx_get (local->fd, this, &ctx);
+
+                if (ret < 0) {
+                        gf_log (this->name, GF_LOG_DEBUG,
+                                "unable to get fd ctx for fd=%p",
+                                local->fd);
+
+                        local->op_ret   = -1;
+                        local->op_errno = EINVAL;
+
+                        afr_unlock (frame, this);
+
+                        return 0;
+                }
+
+                fd_ctx = (afr_fd_ctx_t *)(long) ctx;
+
+                /* skip over children that or down
+                   or don't have the fd open */
+
+                while ((child_index < priv->child_count)
+                       && (!local->child_up[child_index]
+                           || !fd_ctx->opened_on[child_index]))
+
+                        child_index++;
+        } else {
+                /* skip over children that are down */
+                while ((child_index < priv->child_count)
+                       && !local->child_up[child_index])
+                        child_index++;
+        }
 
 	if ((child_index == priv->child_count) &&
 	    local->transaction.lock_count == 0) {