diff options
author | Pranith Kumar K <pkarampu@redhat.com> | 2015-04-26 14:28:00 +0530 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-05-08 20:12:31 -0700 |
commit | a327b9fa9d50a66e7bb3a887ac569be914132d10 (patch) | |
tree | 9e810ad7553f3512383e14ddcf35a7a7ceeadb52 /xlators/cluster/ec/src/ec-helpers.c | |
parent | f54b232b3cc61ee9ca76288958537b53de64de53 (diff) |
cluster/ec: Change meaning of trusted.ec.dirty
- With this change, the xattr will represent if the file needs to be healed or
not. It will have different values for data/entry and metadata changes.
- inode ref leaks and dict_set_dynstr related leaks fixed
- Added support for trylock/lock based on heal-cmd execution or not
in data heal.
- Made fixes to pass regression runs
Change-Id: I9d8def4c2badde18a76b7898816fecfac113737a
BUG: 1216303
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/10385
Reviewed-on: http://review.gluster.org/10693
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-helpers.c')
-rw-r--r-- | xlators/cluster/ec/src/ec-helpers.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xlators/cluster/ec/src/ec-helpers.c b/xlators/cluster/ec/src/ec-helpers.c index e9d842fcfa9..2b497efd166 100644 --- a/xlators/cluster/ec/src/ec-helpers.c +++ b/xlators/cluster/ec/src/ec-helpers.c @@ -181,6 +181,7 @@ int32_t ec_dict_del_array(dict_t *dict, char *key, uint64_t value[], void *ptr; int32_t len; int32_t vindex; + int32_t old_size = 0; if ((dict == NULL) || (dict_get_ptr_and_len(dict, key, &ptr, &len) != 0)) { return -1; @@ -192,11 +193,18 @@ int32_t ec_dict_del_array(dict_t *dict, char *key, uint64_t value[], memset (value, 0, size * sizeof(uint64_t)); /* 3.6 version ec would have stored version in 64 bit. In that case treat - * metadata versions as 0*/ - size = min (size, len/sizeof(uint64_t)); - for (vindex = 0; vindex < size; vindex++) { + * metadata versions same as data*/ + old_size = min (size, len/sizeof(uint64_t)); + for (vindex = 0; vindex < old_size; vindex++) { value[vindex] = ntoh64(*((uint64_t *)ptr + vindex)); } + + if (old_size < size) { + for (vindex = old_size; vindex < size; vindex++) { + value[vindex] = value[old_size-1]; + } + } + dict_del(dict, key); return 0; |