diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2012-03-13 11:15:36 +0530 | 
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-22 04:28:56 -0700 | 
| commit | 64156e71bc71d7100b0e81bbe0702740b37c3ffb (patch) | |
| tree | 7c88823c3890113eb4ebe18af4b5da60732ecfff | |
| parent | f5c87c7bedfda7ed80d03918bfc3ce90069378e8 (diff) | |
cluster/afr: Handle files w.o. xattrs and size mismatch.
BUG: 765587
Change-Id: I1c1a739f25c4a798ba8ccaa52bc23d2c1dadd034
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3395
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 44 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 10 | 
2 files changed, 44 insertions, 10 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index f45d9c76fa9..93392699eca 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -550,15 +550,25 @@ afr_sh_mark_zero_size_file_as_sink (struct iatt *bufs, int32_t *success_children          int             child = 0;          gf_boolean_t    sink_exists = _gf_false;          gf_boolean_t    source_exists = _gf_false; +        int             source = -1;          for (i = 0; i < child_count; i++) {                  child = success_children[i];                  if (child < 0)                          break; -                if (bufs[child].ia_size) -                        source_exists = _gf_true; -                if (!bufs[child].ia_size) +                if (!bufs[child].ia_size) {                          sink_exists = _gf_true; +                        continue; +                } +                if (!source_exists) { +                        source_exists = _gf_true; +                        source = child; +                        continue; +                } +                if (bufs[source].ia_size != bufs[child].ia_size) { +                        nsources = -1; +                        goto out; +                }          }          if (!source_exists && !sink_exists) {                  nsources = -1; @@ -758,6 +768,8 @@ afr_mark_sources (xlator_t *this, int32_t *sources, int32_t **pending_matrix,                                                               success_children,                                                               child_count,                                                               sources); +                        if ((nsources < 0) && subvol_status) +                                *subvol_status |= SPLIT_BRAIN;                          break;                  default:                          break; @@ -1254,6 +1266,9 @@ afr_sh_missing_entries_lookup_done (call_frame_t *frame, xlator_t *this,          ia_type_t       ia_type = IA_INVAL;          int32_t         nsources = 0;          loc_t           *loc = NULL; +        int32_t         subvol_status = 0; +        afr_transaction_type txn_type = AFR_DATA_TRANSACTION; +        gf_boolean_t    data_split_brain = _gf_false;          local = frame->local;          sh = &local->self_heal; @@ -1269,17 +1284,24 @@ afr_sh_missing_entries_lookup_done (call_frame_t *frame, xlator_t *this,          //now No chance for the ia_type to conflict          ia_type = sh->buf[sh->success_children[0]].ia_type; +        txn_type = afr_transaction_type_get (ia_type);          nsources = afr_build_sources (this, sh->xattr, sh->buf,                                        sh->pending_matrix, sh->sources, -                                      sh->success_children, -                                      afr_transaction_type_get (ia_type), -                                      NULL, _gf_false); +                                      sh->success_children, txn_type, +                                      &subvol_status, _gf_false);          if (nsources < 0) {                  gf_log (this->name, GF_LOG_INFO, "No sources for dir of %s,"                          " in missing entry self-heal, continuing with the rest"                          " of the self-heals", local->loc.path); -                op_errno = EIO; -                goto out; +                if ((txn_type == AFR_DATA_TRANSACTION) && +                    (subvol_status & SPLIT_BRAIN)) { +                        data_split_brain = _gf_true; +                        sh->sources[sh->success_children[0]] = 1; +                        nsources = 1; +                } else { +                        op_errno = EIO; +                        goto out; +                }          }          afr_get_fresh_children (sh->success_children, sh->sources, @@ -1296,7 +1318,11 @@ afr_sh_missing_entries_lookup_done (call_frame_t *frame, xlator_t *this,          sh->type = sh->buf[sh->source].ia_type;          if (uuid_is_null (loc->inode->gfid))                  uuid_copy (loc->gfid, sh->buf[sh->source].ia_gfid); -        sh_missing_entries_create (frame, this); +        if (data_split_brain) { +                afr_sh_missing_entries_finish (frame, this); +        } else { +                sh_missing_entries_create (frame, this); +        }          return;  out:          sh->op_failed = 1; diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index 044d412d822..e38b780398a 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -821,9 +821,17 @@ afr_lookup_select_read_child_by_txn_type (xlator_t *this, afr_local_t *local,          nsources = afr_build_sources (this, xattr, bufs, pending_matrix,                                        sources, success_children, txn_type,                                        &subvol_status, _gf_false); -        if (subvol_status & SPLIT_BRAIN) +        if (subvol_status & SPLIT_BRAIN) {                  gf_log (this->name, GF_LOG_WARNING, "%s: Possible split-brain",                          local->loc.path); +                if (txn_type == AFR_DATA_TRANSACTION) { +                        //succeed lookup fail open +                        afr_set_split_brain (this, local->cont.lookup.inode, +                                             _gf_true); +                        nsources = 1; +                        sources[success_children[0]] = 1; +                } +        }          if (nsources < 0)                  goto out;  | 
