summaryrefslogtreecommitdiffstats
path: root/xlators/cluster
diff options
context:
space:
mode:
authorXavier Hernandez <xhernandez@datalab.es>2014-10-06 16:34:58 +0200
committerVijay Bellur <vbellur@redhat.com>2014-10-20 03:40:30 -0700
commitb2a1be0f7bf5e19b266ee57c3287ee9f9170e2f7 (patch)
tree71e558d30e27580466aa2b3ab75799efe30bc54a /xlators/cluster
parent59c6d60996240eb2ef5c7cbcc42ec27c04e38d9c (diff)
ec: Fix incorrect management of healed bricks
The final lookup made to restore final file attributes after a self-heal did clear the mask of bad bricks, causing that the final setattr won't modify any brick at all. This caused that some attriutes, specially the modification time of the file didn't get updated properly. Now the mask of healed bricks is saved before doing the last lookup. It's also used to correctly report the repaired bricks. This is a backport of http://review.gluster.org/8905/ Change-Id: Ib94083c9e1b562515dfb54f9574120f1f031dccc BUG: 1149725 Signed-off-by: Xavier Hernandez <xhernandez@datalab.es> Reviewed-on: http://review.gluster.org/8906 Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/cluster')
-rw-r--r--xlators/cluster/ec/src/ec-common.c8
-rw-r--r--xlators/cluster/ec/src/ec-data.h1
-rw-r--r--xlators/cluster/ec/src/ec-heal.c14
3 files changed, 16 insertions, 7 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
index 4d7beee63b9..2f96ac10dbf 100644
--- a/xlators/cluster/ec/src/ec-common.c
+++ b/xlators/cluster/ec/src/ec-common.c
@@ -1166,7 +1166,13 @@ void ec_get_size_version(ec_fop_data_t * fop)
goto out;
}
- ec_lookup(fop->frame, fop->xl, fop->mask, EC_MINIMUM_MIN,
+ /* For normal fops, ec_lookup() must succeed on at least EC_MINIMUM_MIN
+ * bricks, however when this is called as part of a self-heal operation
+ * the mask of target bricks (fop->mask) could contain less than
+ * EC_MINIMUM_MIN bricks, causing the lookup to always fail. Thus we
+ * always use the same minimum used for the main fop.
+ */
+ ec_lookup(fop->frame, fop->xl, fop->mask, fop->minimum,
ec_get_size_version_set, NULL, &loc, xdata);
fop->frame->root->uid = uid;
diff --git a/xlators/cluster/ec/src/ec-data.h b/xlators/cluster/ec/src/ec-data.h
index 49090933ade..d87cb26b52d 100644
--- a/xlators/cluster/ec/src/ec-data.h
+++ b/xlators/cluster/ec/src/ec-data.h
@@ -278,6 +278,7 @@ struct _ec_heal
uintptr_t good;
uintptr_t bad;
uintptr_t open;
+ uintptr_t fixed;
uint64_t offset;
uint64_t size;
uint64_t version;
diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c
index 54301d10df4..dc11e6d2e87 100644
--- a/xlators/cluster/ec/src/ec-heal.c
+++ b/xlators/cluster/ec/src/ec-heal.c
@@ -70,6 +70,7 @@ void ec_heal_lookup_resume(ec_fop_data_t * fop)
heal->raw_size = cbk->size;
heal->fop->pre_size = cbk->iatt[0].ia_size;
heal->fop->post_size = cbk->iatt[0].ia_size;
+ heal->fop->have_size = 1;
if (!ec_loc_prepare(heal->xl, &heal->loc, cbk->inode,
&cbk->iatt[0]))
@@ -559,7 +560,7 @@ void ec_heal_inodelk(ec_heal_t * heal, int32_t type, int32_t use_fd,
}
}
-void ec_heal_lookup(ec_heal_t * heal)
+void ec_heal_lookup(ec_heal_t *heal, uintptr_t mask)
{
dict_t * xdata;
int32_t error = ENOMEM;
@@ -574,7 +575,7 @@ void ec_heal_lookup(ec_heal_t * heal)
goto out;
}
- ec_lookup(heal->fop->frame, heal->xl, heal->fop->mask, EC_MINIMUM_MIN,
+ ec_lookup(heal->fop->frame, heal->xl, mask, EC_MINIMUM_MIN,
ec_heal_inode_lookup_cbk, heal, &heal->loc, xdata);
error = 0;
@@ -1098,7 +1099,7 @@ void ec_heal_dispatch(ec_heal_t * heal)
{
cbk->uintptr[0] = heal->available;
cbk->uintptr[1] = heal->good;
- cbk->uintptr[2] = heal->bad;
+ cbk->uintptr[2] = heal->fixed;
ec_combine(cbk, NULL);
@@ -1196,7 +1197,7 @@ int32_t ec_manager_heal(ec_fop_data_t * fop, int32_t state)
return EC_STATE_HEAL_PRE_INODE_LOOKUP;
case EC_STATE_HEAL_PRE_INODE_LOOKUP:
- ec_heal_lookup(heal);
+ ec_heal_lookup(heal, heal->fop->mask);
return EC_STATE_HEAL_XATTRIBUTES_REMOVE;
@@ -1278,12 +1279,13 @@ int32_t ec_manager_heal(ec_fop_data_t * fop, int32_t state)
return EC_STATE_HEAL_POST_INODE_LOOKUP;
case EC_STATE_HEAL_POST_INODE_LOOKUP:
- ec_heal_lookup(heal);
+ heal->fixed = heal->bad;
+ ec_heal_lookup(heal, heal->good);
return EC_STATE_HEAL_SETATTR;
case EC_STATE_HEAL_SETATTR:
- ec_setattr(heal->fop->frame, heal->xl, heal->bad, EC_MINIMUM_ONE,
+ ec_setattr(heal->fop->frame, heal->xl, heal->fixed, EC_MINIMUM_ONE,
ec_heal_setattr_cbk, heal, &heal->loc, &heal->iatt,
GF_SET_ATTR_MODE | GF_SET_ATTR_UID | GF_SET_ATTR_GID |
GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME, NULL);