|
 |
50dc83 |
From fb1d503791c874296afab0cd7be59b6865340d72 Mon Sep 17 00:00:00 2001
|
|
|
50dc83 |
From: Xavi Hernandez <jahernan@redhat.com>
|
|
|
50dc83 |
Date: Wed, 25 Sep 2019 11:56:35 +0200
|
|
|
50dc83 |
Subject: [PATCH 302/302] cluster/ec: prevent filling shd log with "table not
|
|
|
50dc83 |
found" messages
|
|
|
50dc83 |
|
|
|
50dc83 |
When self-heal daemon receives an inodelk contention notification, it tries
|
|
|
50dc83 |
to locate the related inode using inode_find() and the inode table owned by
|
|
|
50dc83 |
top-most xlator, which in this case doesn't have any inode table. This causes
|
|
|
50dc83 |
many messages to be logged by inode_find() function because the inode table
|
|
|
50dc83 |
passed is NULL.
|
|
|
50dc83 |
|
|
|
50dc83 |
This patch prevents this by making sure the inode table is not NULL before
|
|
|
50dc83 |
calling inode_find().
|
|
|
50dc83 |
|
|
|
50dc83 |
Upstream patch:
|
|
|
50dc83 |
> Change-Id: I8d001bd180aaaf1521ba40a536b097fcf70c991f
|
|
|
50dc83 |
> Upstream patch link: https://review.gluster.org/c/glusterfs/+/23481
|
|
|
50dc83 |
> Fixes: bz#1755344
|
|
|
50dc83 |
> Signed-off-by: Xavi Hernandez <jahernan@redhat.com>
|
|
|
50dc83 |
|
|
|
50dc83 |
Change-Id: I8d001bd180aaaf1521ba40a536b097fcf70c991f
|
|
|
50dc83 |
BUG: 1754790
|
|
|
50dc83 |
Signed-off-by: Xavi Hernandez <jahernan@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/182207
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
50dc83 |
---
|
|
|
50dc83 |
xlators/cluster/ec/src/ec.c | 15 +++++++++++++--
|
|
|
50dc83 |
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
50dc83 |
|
|
|
50dc83 |
diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c
|
|
|
50dc83 |
index 19094c4..3f31c74 100644
|
|
|
50dc83 |
--- a/xlators/cluster/ec/src/ec.c
|
|
|
50dc83 |
+++ b/xlators/cluster/ec/src/ec.c
|
|
|
50dc83 |
@@ -463,6 +463,7 @@ ec_upcall(ec_t *ec, struct gf_upcall *upcall)
|
|
|
50dc83 |
struct gf_upcall_cache_invalidation *ci = NULL;
|
|
|
50dc83 |
struct gf_upcall_inodelk_contention *lc = NULL;
|
|
|
50dc83 |
inode_t *inode;
|
|
|
50dc83 |
+ inode_table_t *table;
|
|
|
50dc83 |
|
|
|
50dc83 |
switch (upcall->event_type) {
|
|
|
50dc83 |
case GF_UPCALL_CACHE_INVALIDATION:
|
|
|
50dc83 |
@@ -476,8 +477,18 @@ ec_upcall(ec_t *ec, struct gf_upcall *upcall)
|
|
|
50dc83 |
/* The lock is not owned by EC, ignore it. */
|
|
|
50dc83 |
return _gf_true;
|
|
|
50dc83 |
}
|
|
|
50dc83 |
- inode = inode_find(((xlator_t *)ec->xl->graph->top)->itable,
|
|
|
50dc83 |
- upcall->gfid);
|
|
|
50dc83 |
+ table = ((xlator_t *)ec->xl->graph->top)->itable;
|
|
|
50dc83 |
+ if (table == NULL) {
|
|
|
50dc83 |
+ /* Self-heal daemon doesn't have an inode table on the top
|
|
|
50dc83 |
+ * xlator because it doesn't need it. In this case we should
|
|
|
50dc83 |
+ * use the inode table managed by EC itself where all inodes
|
|
|
50dc83 |
+ * being healed should be present. However self-heal doesn't
|
|
|
50dc83 |
+ * use eager-locking and inodelk's are already released as
|
|
|
50dc83 |
+ * soon as possible. In this case we can safely ignore these
|
|
|
50dc83 |
+ * notifications. */
|
|
|
50dc83 |
+ return _gf_false;
|
|
|
50dc83 |
+ }
|
|
|
50dc83 |
+ inode = inode_find(table, upcall->gfid);
|
|
|
50dc83 |
/* If inode is not found, it means that it's already released,
|
|
|
50dc83 |
* so we can ignore it. Probably it has been released and
|
|
|
50dc83 |
* destroyed while the contention notification was being sent.
|
|
|
50dc83 |
--
|
|
|
50dc83 |
1.8.3.1
|
|
|
50dc83 |
|