diff options
| author | Raghavendra G <rgowdapp@redhat.com> | 2015-02-18 12:15:55 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2015-02-20 02:35:00 -0800 |
| commit | 571a71f0acd0ec59340b9d0d2519793e33a1dc16 (patch) | |
| tree | ae52a527578c9138388ba38240bb369c1800e1a0 /xlators/cluster/dht/src/dht-common.h | |
| parent | d8f181d3171ed301a9992615083fcf98992577c8 (diff) | |
cluster/dht: synchronize with other concurrent healers while healing layout.
Current layout heal code assumes layout setting is idempotent. This
allowed multiple concurrent healers to set the layout without any
synchronization. However, this is not the case as different healers
can come up with different layout for same directory and making layout
setting non-idempotent. So, we bring in synchronization among healers
to
1. Not to overwrite an ondisk well-formed layout.
2. Refresh the in-memory layout with the ondisk layout if in-memory
layout needs healing and ondisk layout is well formed.
This patch can synchronize
1. among multiple healers.
2. among multiple fix-layouts (which extends layout to consider
added or removed brick)
3. (but) not between healers and fix-layouts. So, the problem of
in-memory stale layouts (not matching with layout ondisk), is not
_completely_ fixed by this patch.
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
Change-Id: Ia285f25e8d043bb3175c61468d0d11090acee539
BUG: 1176008
Reviewed-on: http://review.gluster.org/9302
Reviewed-by: N Balachandran <nbalacha@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-common.h')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.h | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index fabbe9e2909..27fe9adab56 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -30,6 +30,8 @@ #define GF_DHT_LOOKUP_UNHASHED_AUTO 2 #define DHT_PATHINFO_HEADER "DISTRIBUTE:" #define DHT_FILE_MIGRATE_DOMAIN "dht.file.migrate" +#define DHT_LAYOUT_HEAL_DOMAIN "dht.layout.heal" + #include <fnmatch.h> typedef int (*dht_selfheal_dir_cbk_t) (call_frame_t *frame, void *cookie, @@ -128,9 +130,18 @@ typedef struct { char *domain; /* Only locks within a single domain * contend with each other */ + gf_lkowner_t lk_owner; gf_boolean_t locked; } dht_lock_t; +typedef +int (*dht_selfheal_layout_t)(call_frame_t *frame, loc_t *loc, + dht_layout_t *layout); + +typedef +gf_boolean_t (*dht_need_heal_t)(call_frame_t *frame, dht_layout_t **inmem, + dht_layout_t **ondisk); + struct dht_local { int call_cnt; loc_t loc; @@ -173,12 +184,15 @@ struct dht_local { xlator_t *srcvol; } linkfile; struct { - uint32_t hole_cnt; - uint32_t overlaps_cnt; - uint32_t down; - uint32_t misc; - dht_selfheal_dir_cbk_t dir_cbk; - dht_layout_t *layout; + uint32_t hole_cnt; + uint32_t overlaps_cnt; + uint32_t down; + uint32_t misc; + dht_selfheal_dir_cbk_t dir_cbk; + dht_selfheal_layout_t healer; + dht_need_heal_t should_heal; + gf_boolean_t force_mkdir; + dht_layout_t *layout, *refreshed_layout; } selfheal; uint32_t uid; uint32_t gid; @@ -893,4 +907,13 @@ dht_lock_new (xlator_t *this, xlator_t *xl, loc_t *loc, short type, void dht_lock_array_free (dht_lock_t **lk_array, int count); +inline int32_t +dht_lock_count (dht_lock_t **lk_array, int lk_count); + +int +dht_layout_sort (dht_layout_t *layout); + +int +dht_layout_missing_dirs (dht_layout_t *layout); + #endif/* _DHT_H */ |