summaryrefslogtreecommitdiffstats
path: root/xlators/cluster
diff options
context:
space:
mode:
authorVenky Shankar <vshankar@redhat.com>2014-07-18 15:36:42 +0530
committerVijay Bellur <vbellur@redhat.com>2014-07-23 16:15:21 -0700
commit8a24b1487d440c23b00b56aba5b9bfb77af6ef03 (patch)
treef71ac65c27cc56a2a3c95f3ce63d79c13af36dea /xlators/cluster
parent1706151a42ce92057b01f4c6869bf66c65769021 (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. Change-Id: Ib7bd71e80dd1856770391edb621ba9819cab7056 BUG: 1122037 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>
Diffstat (limited to 'xlators/cluster')
-rw-r--r--xlators/cluster/afr/src/afr-common.c4
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-common.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index e4fbe794f08..04191649b4c 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)
@@ -1494,7 +1494,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)