andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

afr: Avoid resetting event_gen when brick is always down

Browse Source 
Problem:
__afr_set_in_flight_sb_status(), which resets event_gen to zero, is
called if failed_subvols[i] is non-zero for any brick. But failed_subvols[i]
is true even if the brick was down *before* the transaction started.
Hence say if 1 brick is down in  a replica-3, every writev that comes
will trigger an inode refresh because of this resetting, as seen from
the no. of FSTATs in the profile info in the BZ.

Fix:
Reset event gen only if the brick was previously a valid read child and
the FOP failed on it the first time.

Also `s/afr_inode_read_subvol_reset/afr_inode_event_gen_reset` because
the function only resets event gen and not the data/metadata readable.

Change-Id: I603ae646cbde96995c35db77916e2ed80b602a91
BUG: 1409206
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/16309
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
This commit is contained in:
Ravishankar N 2016-12-30 14:57:17 +05:30 committed by Jeff Darcy
parent 79b3fb6e8d
commit 522640be47
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xlators/cluster/afr/src/afr-common.c
View File

@ -155,6 +155,7 @@ __afr_inode_ctx_get (xlator_t *this, inode_t *inode, afr_inode_ctx_t **ctx)
out:
return ret;
}
/*
* INODE CTX 64-bit VALUE FORMAT FOR SMALL (<= 16) SUBVOL COUNTS:
*
@ -216,10 +217,7 @@ __afr_set_in_flight_sb_status (xlator_t *this, afr_local_t *local,
metadatamap_old = metadatamap = (val & 0x000000000000ffff);
datamap_old = datamap = (val & 0x00000000ffff0000) >> 16;
/* Hard-code event to 0 since there is a failure and the inode
* needs to be refreshed anyway.
*/
event = 0;
event = (val & 0xffffffff00000000) >> 32;
if (txn_type == AFR_DATA_TRANSACTION)
tmp_map = datamap;
@ -252,6 +250,8 @@ __afr_set_in_flight_sb_status (xlator_t *this, afr_local_t *local,
local->transaction.in_flight_sb = _gf_true;
metadatamap |= (1 << index);
}
if (metadatamap_old != metadatamap)
event = 0;
break;
case AFR_DATA_TRANSACTION:
@ -261,10 +261,12 @@ __afr_set_in_flight_sb_status (xlator_t *this, afr_local_t *local,
local->transaction.in_flight_sb = _gf_true;
datamap |= (1 << index);
}
if (datamap_old != datamap)
event = 0;
break;
default:
break;
break;
}
val = ((uint64_t) metadatamap) |
@ -375,7 +377,7 @@ out:
}
int
__afr_inode_read_subvol_reset_small (inode_t *inode, xlator_t *this)
__afr_inode_event_gen_reset_small (inode_t *inode, xlator_t *this)
{
int ret = -1;
uint16_t datamap = 0;
@ -476,7 +478,7 @@ out:
}
int
__afr_inode_read_subvol_reset (inode_t *inode, xlator_t *this)
__afr_inode_event_gen_reset (inode_t *inode, xlator_t *this)
{
afr_private_t *priv = NULL;
int ret = -1;
@ -484,7 +486,7 @@ __afr_inode_read_subvol_reset (inode_t *inode, xlator_t *this)
priv = this->private;
if (priv->child_count <= 16)
ret = __afr_inode_read_subvol_reset_small (inode, this);
ret = __afr_inode_event_gen_reset_small (inode, this);
else
ret = -1;
@ -673,7 +675,7 @@ out:
}
int
afr_inode_read_subvol_reset (inode_t *inode, xlator_t *this)
afr_inode_event_gen_reset (inode_t *inode, xlator_t *this)
{
int ret = -1;
@ -681,7 +683,7 @@ afr_inode_read_subvol_reset (inode_t *inode, xlator_t *this)
LOCK(&inode->lock);
{
ret = __afr_inode_read_subvol_reset (inode, this);
ret = __afr_inode_event_gen_reset (inode, this);
}
UNLOCK(&inode->lock);
out:
@ -2209,7 +2211,7 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this)
if (afr_replies_interpret (frame, this, local->inode, NULL)) {
read_subvol = afr_read_subvol_decide (local->inode,
this, &args);
afr_inode_read_subvol_reset (local->inode, this);
afr_inode_event_gen_reset (local->inode, this);
goto cant_interpret;
} else {
read_subvol = afr_data_subvol_get (local->inode, this,

6
xlators/cluster/afr/src/afr-dir-write.c
View File

@ -122,12 +122,12 @@ __afr_dir_write_finalize (call_frame_t *frame, xlator_t *this)
continue;
if (local->replies[i].op_ret < 0) {
if (local->inode)
afr_inode_read_subvol_reset (local->inode, this);
afr_inode_event_gen_reset (local->inode, this);
if (local->parent)
afr_inode_read_subvol_reset (local->parent,
afr_inode_event_gen_reset (local->parent,
this);
if (local->parent2)
afr_inode_read_subvol_reset (local->parent2,
afr_inode_event_gen_reset (local->parent2,
this);
continue;
}

6
xlators/cluster/afr/src/afr.h
View File

@ -894,7 +894,7 @@ afr_inode_read_subvol_set (inode_t *inode, xlator_t *this,
int event_generation);
int
afr_inode_read_subvol_reset (inode_t *inode, xlator_t *this);
afr_inode_event_gen_reset (inode_t *inode, xlator_t *this);
int
afr_read_subvol_select_by_policy (inode_t *inode, xlator_t *this,
@ -917,10 +917,6 @@ afr_read_subvol_get (inode_t *inode, xlator_t *this, int *subvol_p,
#define afr_metadata_subvol_get(i, t, s, r, e, a) \
afr_read_subvol_get(i, t, s, r, e, AFR_METADATA_TRANSACTION, a)
int
afr_inode_ctx_reset_unreadable_subvol (inode_t *inode, xlator_t *this,
int subvol_idx, int txn_type);
int
afr_inode_refresh (call_frame_t *frame, xlator_t *this, inode_t *inode,
uuid_t gfid, afr_inode_refresh_cbk_t cbk);