|
 |
12a457 |
From 47668d23639795c3704075276f07dd6434e041bb Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Anuradha Talur <atalur@redhat.com>
|
|
|
12a457 |
Date: Wed, 4 May 2016 11:55:43 +0530
|
|
|
12a457 |
Subject: [PATCH 121/139] heal: Fix incorrect heal info output
|
|
|
12a457 |
|
|
|
12a457 |
Backport of: review.gluster.org/14199
|
|
|
12a457 |
|
|
|
12a457 |
Problem:
|
|
|
12a457 |
In heterogenous clusters, heal info gives incorrect
|
|
|
12a457 |
outout as "Failed to process entries completely.
|
|
|
12a457 |
Number of entries so far: 0".
|
|
|
12a457 |
|
|
|
12a457 |
This happens when the getxattr on virtual xattr
|
|
|
12a457 |
for <brickpath>/.glusterfs/indices/dirty fails
|
|
|
12a457 |
on older bricks as they do not recognize the xattr.
|
|
|
12a457 |
|
|
|
12a457 |
Fix:
|
|
|
12a457 |
Ignore that error so that heal info doesn't
|
|
|
12a457 |
incorrectly report failure.
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I0d3541ed0594d67c3c3b8568a89a975a100bf6dd
|
|
|
12a457 |
BUG: 1311362
|
|
|
12a457 |
>BUG: 1332798
|
|
|
12a457 |
>Signed-off-by: Anuradha Talur <atalur@redhat.com>
|
|
|
12a457 |
>Reviewed-on: http://review.gluster.org/14199
|
|
|
12a457 |
>Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
12a457 |
>Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
12a457 |
>Smoke: Gluster Build System <jenkins@build.gluster.com>
|
|
|
12a457 |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
12a457 |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
|
|
|
12a457 |
>Signed-off-by: Anuradha Talur <atalur@redhat.com>
|
|
|
12a457 |
|
|
|
12a457 |
Signed-off-by: Anuradha Talur <atalur@redhat.com>
|
|
|
12a457 |
Change-Id: If69a5c2dc986391bc30352714ed7e8d5ef0d6335
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/73679
|
|
|
12a457 |
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
heal/src/glfs-heal.c | 3 ++-
|
|
|
12a457 |
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c
|
|
|
12a457 |
index 4e381e8..1af58de 100644
|
|
|
12a457 |
--- a/heal/src/glfs-heal.c
|
|
|
12a457 |
+++ b/heal/src/glfs-heal.c
|
|
|
12a457 |
@@ -448,7 +448,8 @@ glfsh_print_pending_heals_type (glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc
|
|
|
12a457 |
ret = glfsh_get_index_dir_loc (rootloc, xl, &dirloc, &op_errno,
|
|
|
12a457 |
vgfid);
|
|
|
12a457 |
if (ret < 0) {
|
|
|
12a457 |
- if (op_errno == ESTALE || op_errno == ENOENT)
|
|
|
12a457 |
+ if (op_errno == ESTALE || op_errno == ENOENT ||
|
|
|
12a457 |
+ op_errno == ENOTSUP)
|
|
|
12a457 |
ret = 0;
|
|
|
12a457 |
else
|
|
|
12a457 |
ret = -op_errno;
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|