diff options
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 38 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-entry.c | 34 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-metadata.c | 40 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-name.c | 35 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 1 |
5 files changed, 66 insertions, 82 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index c0548d9958f..402474e787b 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -388,7 +388,6 @@ __afr_selfheal_truncate_sinks (call_frame_t *frame, xlator_t *this, */ static int __afr_selfheal_data_finalize_source (xlator_t *this, unsigned char *sources, - unsigned char *sinks, unsigned char *healed_sinks, unsigned char *locked_on, struct afr_reply *replies) @@ -397,17 +396,14 @@ __afr_selfheal_data_finalize_source (xlator_t *this, unsigned char *sources, afr_private_t *priv = NULL; uint64_t size = 0; int source = -1; - int locked_count = 0; int sources_count = 0; - int healed_sinks_count = 0; priv = this->private; - locked_count = AFR_COUNT (locked_on, priv->child_count); sources_count = AFR_COUNT (sources, priv->child_count); - healed_sinks_count = AFR_COUNT (healed_sinks, priv->child_count); - if (locked_count == healed_sinks_count || !sources_count) { + if ((AFR_CMP (locked_on, healed_sinks, priv->child_count) == 0) + || !sources_count) { /* split brain */ return -EIO; } @@ -426,7 +422,7 @@ __afr_selfheal_data_finalize_source (xlator_t *this, unsigned char *sources, continue; if (replies[i].poststat.ia_size < size) { sources[i] = 0; - sinks[i] = 1; + healed_sinks[i] = 1; } } @@ -451,7 +447,6 @@ __afr_selfheal_data_prepare (call_frame_t *frame, xlator_t *this, fd_t *fd, int ret = -1; int source = -1; afr_private_t *priv = NULL; - int i = 0; priv = this->private; @@ -466,22 +461,21 @@ __afr_selfheal_data_prepare (call_frame_t *frame, xlator_t *this, fd_t *fd, if (ret) return ret; - source = __afr_selfheal_data_finalize_source (this, sources, sinks, - healed_sinks, locked_on, - replies); - if (source < 0) - return -EIO; + /* Initialize the healed_sinks[] array optimistically to + the intersection of to-be-healed (i.e sinks[]) and + the list of servers which are up (i.e locked_on[]). - for (i = 0; i < priv->child_count; i++) - /* Initialize the healed_sinks[] array optimistically to - the intersection of to-be-healed (i.e sinks[]) and - the list of servers which are up (i.e locked_on[]). + As we encounter failures in the healing process, we + will unmark the respective servers in the healed_sinks[] + array. + */ + AFR_INTERSECT (healed_sinks, sinks, locked_on, priv->child_count); - As we encounter failures in the healing process, we - will unmark the respective servers in the healed_sinks[] - array. - */ - healed_sinks[i] = sinks[i] && locked_on[i]; + source = __afr_selfheal_data_finalize_source (this, sources, + healed_sinks, locked_on, + replies); + if (source < 0) + return -EIO; return source; } diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index 9e714b0263c..dc1546c7403 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -430,24 +430,21 @@ afr_selfheal_entry_do (call_frame_t *frame, xlator_t *this, fd_t *fd, static int __afr_selfheal_entry_finalize_source (xlator_t *this, unsigned char *sources, - unsigned char *sinks, + unsigned char *healed_sinks, unsigned char *locked_on, struct afr_reply *replies) { int i = 0; afr_private_t *priv = NULL; int source = -1; - int locked_count = 0; int sources_count = 0; - int sinks_count = 0; priv = this->private; - locked_count = AFR_COUNT (locked_on, priv->child_count); sources_count = AFR_COUNT (sources, priv->child_count); - sinks_count = AFR_COUNT (sinks, priv->child_count); - if (locked_count == sinks_count || !sources_count) { + if ((AFR_CMP (locked_on, healed_sinks, priv->child_count) == 0) + || !sources_count) { return -1; } @@ -471,7 +468,6 @@ __afr_selfheal_entry_prepare (call_frame_t *frame, xlator_t *this, fd_t *fd, int ret = -1; int source = -1; afr_private_t *priv = NULL; - int i = 0; priv = this->private; @@ -486,7 +482,18 @@ __afr_selfheal_entry_prepare (call_frame_t *frame, xlator_t *this, fd_t *fd, if (ret) return ret; - source = __afr_selfheal_entry_finalize_source (this, sources, sinks, + /* Initialize the healed_sinks[] array optimistically to + the intersection of to-be-healed (i.e sinks[]) and + the list of servers which are up (i.e locked_on[]). + + As we encounter failures in the healing process, we + will unmark the respective servers in the healed_sinks[] + array. + */ + AFR_INTERSECT (healed_sinks, sinks, locked_on, priv->child_count); + + source = __afr_selfheal_entry_finalize_source (this, sources, + healed_sinks, locked_on, replies); if (source < 0) { /* If source is < 0 (typically split-brain), we perform a @@ -494,17 +501,6 @@ __afr_selfheal_entry_prepare (call_frame_t *frame, xlator_t *this, fd_t *fd, } *source_p = source; - for (i = 0; i < priv->child_count; i++) - /* Initialize the healed_sinks[] array optimistically to - the intersection of to-be-healed (i.e sinks[]) and - the list of servers which are up (i.e locked_on[]). - - As we encounter failures in the healing process, we - will unmark the respective servers in the healed_sinks[] - array. - */ - healed_sinks[i] = sinks[i] && locked_on[i]; - return ret; } diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 8fa59f86880..683fb2dd60a 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -88,7 +88,7 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, static int __afr_selfheal_metadata_finalize_source (xlator_t *this, unsigned char *sources, - unsigned char *sinks, + unsigned char *healed_sinks, unsigned char *locked_on, struct afr_reply *replies) { @@ -96,26 +96,23 @@ __afr_selfheal_metadata_finalize_source (xlator_t *this, unsigned char *sources, afr_private_t *priv = NULL; struct iatt first = {0, }; int source = -1; - int locked_count = 0; int sources_count = 0; - int sinks_count = 0; priv = this->private; - locked_count = AFR_COUNT (locked_on, priv->child_count); sources_count = AFR_COUNT (sources, priv->child_count); - sinks_count = AFR_COUNT (sinks, priv->child_count); - if (locked_count == sinks_count || !sources_count) { + if ((AFR_CMP (locked_on, healed_sinks, priv->child_count) == 0) + || !sources_count) { if (!priv->metadata_splitbrain_forced_heal) { return -EIO; } /* Metadata split brain, select one subvol arbitrarily */ for (i = 0; i < priv->child_count; i++) { - if (locked_on[i] && sinks[i]) { + if (locked_on[i] && healed_sinks[i]) { sources[i] = 1; - sinks[i] = 0; + healed_sinks[i] = 0; break; } } @@ -138,7 +135,7 @@ __afr_selfheal_metadata_finalize_source (xlator_t *this, unsigned char *sources, !IA_EQUAL (first, replies[i].poststat, gid) || !IA_EQUAL (first, replies[i].poststat, prot)) { sources[i] = 0; - sinks[i] = 1; + healed_sinks[i] = 1; } } @@ -155,7 +152,6 @@ __afr_selfheal_metadata_prepare (call_frame_t *frame, xlator_t *this, inode_t *i int ret = -1; int source = -1; afr_private_t *priv = NULL; - int i = 0; priv = this->private; @@ -170,22 +166,22 @@ __afr_selfheal_metadata_prepare (call_frame_t *frame, xlator_t *this, inode_t *i if (ret) return ret; - source = __afr_selfheal_metadata_finalize_source (this, sources, sinks, + /* Initialize the healed_sinks[] array optimistically to + the intersection of to-be-healed (i.e sinks[]) and + the list of servers which are up (i.e locked_on[]). + + As we encounter failures in the healing process, we + will unmark the respective servers in the healed_sinks[] + array. + */ + AFR_INTERSECT (healed_sinks, sinks, locked_on, priv->child_count); + + source = __afr_selfheal_metadata_finalize_source (this, sources, + healed_sinks, locked_on, replies); if (source < 0) return -EIO; - for (i = 0; i < priv->child_count; i++) - /* Initialize the healed_sinks[] array optimistically to - the intersection of to-be-healed (i.e sinks[]) and - the list of servers which are up (i.e locked_on[]). - - As we encounter failures in the healing process, we - will unmark the respective servers in the healed_sinks[] - array. - */ - healed_sinks[i] = sinks[i] && locked_on[i]; - return source; } diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c index 151c401e3b1..f09eb0be6ba 100644 --- a/xlators/cluster/afr/src/afr-self-heal-name.c +++ b/xlators/cluster/afr/src/afr-self-heal-name.c @@ -263,23 +263,21 @@ __afr_selfheal_name_do (call_frame_t *frame, xlator_t *this, inode_t *parent, int __afr_selfheal_name_finalize_source (xlator_t *this, unsigned char *sources, - unsigned char *sinks, unsigned char *locked_on, + unsigned char *healed_sinks, + unsigned char *locked_on, struct afr_reply *replies) { int i = 0; afr_private_t *priv = NULL; int source = -1; - int locked_count = 0; int sources_count = 0; - int sinks_count = 0; priv = this->private; - locked_count = AFR_COUNT (locked_on, priv->child_count); sources_count = AFR_COUNT (sources, priv->child_count); - sinks_count = AFR_COUNT (sinks, priv->child_count); - if (locked_count == sinks_count || !sources_count) { + if ((AFR_CMP (locked_on, healed_sinks, priv->child_count) == 0) + || !sources_count) { return -1; } @@ -304,7 +302,6 @@ __afr_selfheal_name_prepare (call_frame_t *frame, xlator_t *this, inode_t *paren int ret = -1; int source = -1; afr_private_t *priv = NULL; - int i = 0; priv = this->private; @@ -318,7 +315,18 @@ __afr_selfheal_name_prepare (call_frame_t *frame, xlator_t *this, inode_t *paren if (ret) return ret; - source = __afr_selfheal_name_finalize_source (this, sources, sinks, + /* Initialize the healed_sinks[] array optimistically to + the intersection of to-be-healed (i.e sinks[]) and + the list of servers which are up (i.e locked_on[]). + + As we encounter failures in the healing process, we + will unmark the respective servers in the healed_sinks[] + array. + */ + AFR_INTERSECT (healed_sinks, sinks, locked_on, priv->child_count); + + source = __afr_selfheal_name_finalize_source (this, sources, + healed_sinks, locked_on, replies); if (source < 0) { /* If source is < 0 (typically split-brain), we perform a @@ -326,17 +334,6 @@ __afr_selfheal_name_prepare (call_frame_t *frame, xlator_t *this, inode_t *paren } *source_p = source; - for (i = 0; i < priv->child_count; i++) - /* Initialize the healed_sinks[] array optimistically to - the intersection of to-be-healed (i.e sinks[]) and - the list of servers which are up (i.e locked_on[]). - - As we encounter failures in the healing process, we - will unmark the respective servers in the healed_sinks[] - array. - */ - healed_sinks[i] = sinks[i] && locked_on[i]; - return ret; } diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 91eef2bf1b7..35d4d545bc9 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -50,6 +50,7 @@ typedef int (*afr_changelog_resume_t) (call_frame_t *frame, xlator_t *this); #define alloca0(size) ({void *__ptr; __ptr = alloca(size); memset(__ptr, 0, size); __ptr;}) #define AFR_COUNT(array,max) ({int __i; int __res = 0; for (__i = 0; __i < max; __i++) if (array[__i]) __res++; __res;}) #define AFR_INTERSECT(dst,src1,src2,max) ({int __i; for (__i = 0; __i < max; __i++) dst[__i] = src1[__i] && src2[__i];}) +#define AFR_CMP(a1,a2,len) ({int __cmp = 0; int __i; for (__i = 0; __i < len; __i++) if (a1[__i] != a2[__i]) { __cmp = 1; break;} __cmp;}) typedef struct _afr_private { gf_lock_t lock; /* to guard access to child_count, etc */ |