summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2017-03-07 14:32:18 +0530
committerAtin Mukherjee <amukherj@redhat.com>2017-03-07 12:52:29 -0500
commitfabce246ae948e8e3060dee4a720cd64ac76fdaf (patch)
tree4b5f124fde576d1b3a405c9d200b3df46ba8e73c
parentce8d8195dc253a87cceaaeeb1a725090471ae4f8 (diff)
cluster/ec: Don't mark dirty on entry/meta ops in query-info
We wanted to mark dirty for metadata/entry operations whenever query-info is set and info is not yet there because we are anyway sending xattrop over the network. But this is causing 25% regression from 3.8.8 so removing this optimization Also fixed two small issues that we didn't find in the previous patch 1) reconfigure failure was sending return value 0 for optimistic-changelog 2) ec->optimistic_changelog was set to true even before OPTION_INIT BUG: 1408809 Change-Id: Iabb0b64bd4d3623688790e4b67e5c20b4da977a1 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: https://review.gluster.org/16865 Reviewed-by: Xavier Hernandez <xhernandez@datalab.es> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--xlators/cluster/ec/src/ec-common.c6
-rw-r--r--xlators/cluster/ec/src/ec.c5
2 files changed, 2 insertions, 9 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
index 3ae7f110d99..a46cf6b1c55 100644
--- a/xlators/cluster/ec/src/ec-common.c
+++ b/xlators/cluster/ec/src/ec-common.c
@@ -1136,12 +1136,6 @@ void ec_get_size_version(ec_lock_link_t *link)
!(ec->node_mask & ~link->lock->good_mask) && !ec_is_data_fop (fop->id))
link->optimistic_changelog = _gf_true;
- /* If ctx->have_info is false and lock->query is true, it means that we'll
- * send the xattrop anyway, so we can use it to update dirty counts, even
- * if it's not necessary to do it right now. */
- if (!ctx->have_info && lock->query)
- link->optimistic_changelog = _gf_false;
-
set_dirty = ec_set_dirty_flag (link, ctx, dirty);
/* If ec metadata has already been retrieved, do not try again. */
diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c
index 01f1473f96d..d61ff1bf36a 100644
--- a/xlators/cluster/ec/src/ec.c
+++ b/xlators/cluster/ec/src/ec.c
@@ -291,6 +291,8 @@ reconfigure (xlator_t *this, dict_t *options)
GF_OPTION_RECONF ("read-policy", read_policy, options, str, failed);
+ GF_OPTION_RECONF ("optimistic-change-log", ec->optimistic_changelog,
+ options, bool, failed);
ret = 0;
if (ec_assign_read_policy (ec, read_policy)) {
ret = -1;
@@ -301,8 +303,6 @@ reconfigure (xlator_t *this, dict_t *options)
ret = -1;
}
- GF_OPTION_RECONF ("optimistic-change-log", ec->optimistic_changelog,
- options, bool, failed);
failed:
return ret;
}
@@ -613,7 +613,6 @@ init (xlator_t *this)
this->private = ec;
ec->xl = this;
- ec->optimistic_changelog = _gf_true;
LOCK_INIT(&ec->lock);
INIT_LIST_HEAD(&ec->pending_fops);