From 9504c104d16856095ee99180d38aef02e51b0d60 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Tue, 17 Nov 2015 17:01:47 +0530 Subject: cluster/ec: Mark self-heal fops as internal >Change-Id: I8ae7af266d3e00460f0cfdc9389a926e5f2fee36 >BUG: 1282761 >Signed-off-by: Pranith Kumar K >Reviewed-on: http://review.gluster.org/12598 >Tested-by: Gluster Build System >Tested-by: NetBSD Build System >Reviewed-by: Xavier Hernandez BUG: 1283757 Change-Id: Ic20d4ee031265305db1a6ed2cf591ce94b7d0749 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/12668 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- xlators/cluster/ec/src/ec-heal.c | 4 +++- xlators/cluster/ec/src/ec-heald.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'xlators/cluster/ec/src') diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c index 1a353b9b2e7..94ff4757b4d 100644 --- a/xlators/cluster/ec/src/ec-heal.c +++ b/xlators/cluster/ec/src/ec-heal.c @@ -1369,7 +1369,7 @@ ec_heal_names (call_frame_t *frame, ec_t *ec, inode_t *inode, if (!participants[i]) continue; syncop_dir_scan (ec->xl_list[i], &loc, - GF_CLIENT_PID_AFR_SELF_HEALD, &name_data, + GF_CLIENT_PID_SELF_HEALD, &name_data, ec_name_heal_handler); for (j = 0; j < ec->nodes; j++) if (name_data.failed_on[j]) @@ -2325,6 +2325,8 @@ ec_heal_do (xlator_t *this, void *data, loc_t *loc, int32_t partial) /*Do heal as root*/ frame->root->uid = 0; frame->root->gid = 0; + /*Mark the fops as internal*/ + frame->root->pid = GF_CLIENT_PID_SELF_HEALD; participants = alloca0(ec->nodes); ec_mask_to_char_array (ec->xl_up, participants, ec->nodes); if (loc->name && strlen (loc->name)) { diff --git a/xlators/cluster/ec/src/ec-heald.c b/xlators/cluster/ec/src/ec-heald.c index 0c84a890fad..2e5098a3612 100644 --- a/xlators/cluster/ec/src/ec-heald.c +++ b/xlators/cluster/ec/src/ec-heald.c @@ -293,7 +293,7 @@ ec_shd_index_sweep (struct subvol_healer *healer) goto out; } - ret = syncop_dir_scan (subvol, &loc, GF_CLIENT_PID_AFR_SELF_HEALD, + ret = syncop_dir_scan (subvol, &loc, GF_CLIENT_PID_SELF_HEALD, healer, ec_shd_index_heal); out: if (loc.inode) @@ -351,7 +351,7 @@ ec_shd_full_sweep (struct subvol_healer *healer, inode_t *inode) ec = healer->this->private; loc.inode = inode; return syncop_ftw (ec->xl_list[healer->subvol], &loc, - GF_CLIENT_PID_AFR_SELF_HEALD, healer, + GF_CLIENT_PID_SELF_HEALD, healer, ec_shd_full_heal); } -- cgit