summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2014-07-18 15:36:42 +0530
committerVijay Bellur <vbellur@redhat.com>2014-09-08 10:21:17 -0700
commit0db65a084608a9deb0d0917f084e0d55e23e54a7 (patch)
treeeb5447fb94e95dabaf3ac0af44803970b47dd57b /xlators
parent10aebe1c8be9ab87be233b4c4e6d94279864c461 (diff)
features/changelog: Capture "correct" internal FOPs
This patch fixes changelog capturing internal FOPs in a cascaded setup, where the intermediate master would record internal FOPs (generated by DHT on link()/rename()). This is due to I/O happening on the intermediate slave on geo-replication's auxillary mount with client-pid -1. Currently, the internal FOP capturing logic depends on client pid being non-negative and the presence of a special key in dictionary. Due to this, internal FOPs on an inter-mediate master would be recorded in the changelog. Checking client-pid being non-negative was introduced to capture AFR self-heal traffic in changelog, thereby breaking cascading setups. By coincidence, AFR self-heal daemon uses -1 as frame->root->pid thereby making is hard to differentiate b/w geo-rep's auxillary mount and self-heal daemon. BUG: 1138952 Change-Id: Ia08a2cfa3b02bb785f343794f5b2695d44398c4c Original-Author: Venky Shankar <vshankar@redhat.com> Signed-off-by: Kotresh H R <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/8347 Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/8638
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/afr/src/afr-common.c4
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-common.c8
-rw-r--r--xlators/features/changelog/src/changelog-helpers.h13
3 files changed, 14 insertions, 11 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 13dd81e25fe..8fc202512f1 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -514,7 +514,7 @@ afr_inode_refresh_done (call_frame_t *frame, xlator_t *this)
if (ret && afr_selfheal_enabled (this)) {
heal = copy_frame (frame);
if (heal)
- heal->root->pid = -1;
+ heal->root->pid = GF_CLIENT_PID_AFR_SELF_HEALD;
ret = synctask_new (this->ctx->env, afr_refresh_selfheal_wrap,
afr_refresh_selfheal_done, heal, frame);
if (ret)
@@ -1497,7 +1497,7 @@ afr_lookup_entry_heal (call_frame_t *frame, xlator_t *this)
if (need_heal) {
heal = copy_frame (frame);
if (heal)
- heal->root->pid = -1;
+ heal->root->pid = GF_CLIENT_PID_AFR_SELF_HEALD;
ret = synctask_new (this->ctx->env, afr_lookup_selfheal_wrap,
afr_refresh_selfheal_done, heal, frame);
if (ret)
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index 56691e27752..1d0831f0752 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -947,10 +947,10 @@ afr_inode_find (xlator_t *this, uuid_t gfid)
call_frame_t *
afr_frame_create (xlator_t *this)
{
- call_frame_t *frame = NULL;
- afr_local_t *local = NULL;
- int op_errno = 0;
- pid_t pid = -1;
+ call_frame_t *frame = NULL;
+ afr_local_t *local = NULL;
+ int op_errno = 0;
+ pid_t pid = GF_CLIENT_PID_AFR_SELF_HEALD;
frame = create_frame (this, this->ctx->pool);
if (!frame)
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h
index d4af1ff3445..9bd4a3ff37c 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -539,11 +539,14 @@ int __chlog_barrier_enable (xlator_t *this, changelog_priv_t *priv);
goto label; \
} while (0)
-/* ignore internal fops */
-#define CHANGELOG_IF_INTERNAL_FOP_THEN_GOTO(frame, dict, label) do { \
- if ((frame->root->pid > 0) && \
- dict && dict_get (dict, GLUSTERFS_INTERNAL_FOP_KEY)) \
- goto label; \
+/**
+ * ignore internal fops for all clients except AFR self-heal daemon
+ */
+#define CHANGELOG_IF_INTERNAL_FOP_THEN_GOTO(frame, dict, label) do { \
+ if ((frame->root->pid != GF_CLIENT_PID_AFR_SELF_HEALD) \
+ && dict \
+ && dict_get (dict, GLUSTERFS_INTERNAL_FOP_KEY)) \
+ goto label; \
} while (0)
#define CHANGELOG_COND_GOTO(priv, cond, label) do { \