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

cluster/afr: Make read child match check in afr optional

Browse Source 
Having this particular check which was introduced by
commit c78998c39f0857ea7aacba360632c148afc54a55 causes a drop in
performance in readdirp. So the behavior is made configurable with this
patch.

Change-Id: I2858fc18b3539df7aa6d3f489e0d5cfaeb8a9b3c
BUG: 1202669
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/9917
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
This commit is contained in:
Krutika Dhananjay 2015-03-17 13:16:45 +05:30 committed by Pranith Kumar Karampuri
parent 368dfd6959
commit c9b1aea9b3
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xlators/cluster/afr/src/afr-dir-read.c
View File

@ -149,6 +149,10 @@ afr_validate_read_subvol (inode_t *inode, xlator_t *this, int par_read_subvol)
* either afr_data_subvol_get() or afr_metadata_subvol_get() would * either afr_data_subvol_get() or afr_metadata_subvol_get() would
* yield the same result. Hence, choosing afr_data_subvol_get() below. * yield the same result. Hence, choosing afr_data_subvol_get() below.
*/ */
if (!priv->consistent_metadata)
return 0;
entry_read_subvol = afr_data_subvol_get (inode, this, 0, 0); entry_read_subvol = afr_data_subvol_get (inode, this, 0, 0);
if (entry_read_subvol != par_read_subvol) if (entry_read_subvol != par_read_subvol)
return -1; return -1;

14
xlators/cluster/afr/src/afr.c
View File

@ -213,6 +213,8 @@ reconfigure (xlator_t *this, dict_t *options)
GF_OPTION_RECONF ("quorum-reads", priv->quorum_reads, options, GF_OPTION_RECONF ("quorum-reads", priv->quorum_reads, options,
bool, out); bool, out);
GF_OPTION_RECONF ("consistent-metadata", priv->consistent_metadata,
options, bool, out);
priv->did_discovery = _gf_false; priv->did_discovery = _gf_false;
@ -363,6 +365,8 @@ init (xlator_t *this)
GF_OPTION_INIT ("heal-timeout", priv->shd.timeout, int32, out); GF_OPTION_INIT ("heal-timeout", priv->shd.timeout, int32, out);
GF_OPTION_INIT ("quorum-reads", priv->quorum_reads, bool, out); GF_OPTION_INIT ("quorum-reads", priv->quorum_reads, bool, out);
GF_OPTION_INIT ("consistent-metadata", priv->consistent_metadata, bool,
out);
priv->wait_count = 1; priv->wait_count = 1;
@ -780,5 +784,15 @@ struct volume_options options[] = {
.description = "time interval for checking the need to self-heal " .description = "time interval for checking the need to self-heal "
"in self-heal-daemon" "in self-heal-daemon"
}, },
{ .key = {"consistent-metadata"},
.type = GF_OPTION_TYPE_BOOL,
.default_value = "no",
.description = "If this option is enabled, readdirp will force "
"lookups on those entries read whose read child is "
"not the same as that of the parent. This will "
"guarantee that all read operations on a file serve "
"attributes from the same subvol as long as it holds "
" a good copy of the file/dir.",
},
{ .key = {NULL} }, { .key = {NULL} },
}; };

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

@ -125,6 +125,7 @@ typedef struct _afr_private {
/* pump dependencies */ /* pump dependencies */
void *pump_private; void *pump_private;
gf_boolean_t use_afr_in_pump; gf_boolean_t use_afr_in_pump;
gf_boolean_t consistent_metadata;
} afr_private_t; } afr_private_t;

6
xlators/mgmt/glusterd/src/glusterd-volume-set.c
View File

@ -517,6 +517,12 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = 3, .op_version = 3,
.flags = OPT_FLAG_CLIENT_OPT .flags = OPT_FLAG_CLIENT_OPT
}, },
{ .key = "cluster.consistent-metadata",
.voltype = "cluster/replicate",
.type = DOC,
.op_version = GD_OP_VERSION_3_7_0,
.flags = OPT_FLAG_CLIENT_OPT
},
/* Stripe xlator options */ /* Stripe xlator options */
{ .key = "cluster.stripe-block-size", { .key = "cluster.stripe-block-size",