|
 |
7c2869 |
From f9854c27c373101670f1e543e3f05fca0cd55797 Mon Sep 17 00:00:00 2001
|
|
|
7c2869 |
From: Krutika Dhananjay <kdhananj@redhat.com>
|
|
|
7c2869 |
Date: Mon, 26 Feb 2018 15:22:58 +0530
|
|
|
7c2869 |
Subject: [PATCH 663/675] features/shard: Pass the correct block-num to store
|
|
|
7c2869 |
in inode ctx
|
|
|
7c2869 |
|
|
|
7c2869 |
> Upstream: https://review.gluster.org/19630
|
|
|
7c2869 |
> BUG: 1468483
|
|
|
7c2869 |
> Change-Id: Icf3a5d0598a081adb7d234a60bd15250a5ce1532
|
|
|
7c2869 |
|
|
|
7c2869 |
Change-Id: Icf3a5d0598a081adb7d234a60bd15250a5ce1532
|
|
|
7c2869 |
BUG: 1583462
|
|
|
7c2869 |
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
|
|
|
7c2869 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/140379
|
|
|
7c2869 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
7c2869 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
7c2869 |
---
|
|
|
7c2869 |
xlators/features/shard/src/shard.c | 2 +-
|
|
|
7c2869 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7c2869 |
|
|
|
7c2869 |
diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c
|
|
|
7c2869 |
index 4311f74..3345883 100644
|
|
|
7c2869 |
--- a/xlators/features/shard/src/shard.c
|
|
|
7c2869 |
+++ b/xlators/features/shard/src/shard.c
|
|
|
7c2869 |
@@ -641,7 +641,6 @@ shard_common_resolve_shards (call_frame_t *frame, xlator_t *this,
|
|
|
7c2869 |
gf_msg_debug (this->name, 0, "Shard %d already "
|
|
|
7c2869 |
"present. gfid=%s. Saving inode for future.",
|
|
|
7c2869 |
shard_idx_iter, uuid_utoa(inode->gfid));
|
|
|
7c2869 |
- shard_idx_iter++;
|
|
|
7c2869 |
local->inode_list[i] = inode;
|
|
|
7c2869 |
/* Let the ref on the inodes that are already present
|
|
|
7c2869 |
* in inode table still be held so that they don't get
|
|
|
7c2869 |
@@ -655,6 +654,7 @@ shard_common_resolve_shards (call_frame_t *frame, xlator_t *this,
|
|
|
7c2869 |
shard_idx_iter);
|
|
|
7c2869 |
}
|
|
|
7c2869 |
UNLOCK(&priv->lock);
|
|
|
7c2869 |
+ shard_idx_iter++;
|
|
|
7c2869 |
|
|
|
7c2869 |
continue;
|
|
|
7c2869 |
} else {
|
|
|
7c2869 |
--
|
|
|
7c2869 |
1.8.3.1
|
|
|
7c2869 |
|