summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@fb.com>2017-07-03 08:18:43 -0700
committerJeff Darcy <jdarcy@fb.com>2017-07-03 08:18:43 -0700
commitdb9d4408e9a14d20c9b2fb972310b391a54b0fd0 (patch)
tree2f62986a2ca9b63ebad8616de53a7da8a2f4aaef
parent53a7ea23a45b7c013a4809c418d5428c317d97f6 (diff)
Revert "cluster/afr: Fix metadata split-brain flow (HOTFIX)"
This reverts commit 992a9f8494a358f828eeef34b46e9f5ccfca1d3b.
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-metadata.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c
index 44374d5c0ad..d5d95ef8852 100644
--- a/xlators/cluster/afr/src/afr-self-heal-metadata.c
+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c
@@ -216,23 +216,6 @@ __afr_selfheal_metadata_finalize_source (call_frame_t *frame, xlator_t *this,
sources_count = AFR_COUNT (sources, priv->child_count);
- if (sources_count == 0) {
- afr_sh_get_source_by_policy (this, sources, healed_sinks,
- locked_on, replies, inode);
- sources_count = AFR_COUNT (sources, priv->child_count);
- /* __afr_selfheal_metadata_prepare tinkers with the state
- * of healed_sinks pre-maturely (the source hasn't
- * actually been finalized yet!), so reset the children
- * which aren't our source to sinks so we can heal.
- * I'll leave it to the AFR2 maintainer to fix that code
- * in the future as they may have had a good reason.
- */
- for (i = 0; i < priv->child_count; i++) {
- if (!sources[i] && locked_on[i])
- healed_sinks[i] = 1;
- }
- }
-
if ((AFR_CMP (locked_on, healed_sinks, priv->child_count) == 0)
|| !sources_count) {