|
 |
21ab4e |
From 994bcc0ca9b371172ae19ee339e788da2072940b Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Ravishankar N <ravishankar@redhat.com>
|
|
|
21ab4e |
Date: Tue, 30 May 2017 10:18:04 +0530
|
|
|
21ab4e |
Subject: [PATCH 493/509] nl-cache: Remove null check validation for
|
|
|
21ab4e |
frame->local in lookup cbk
|
|
|
21ab4e |
|
|
|
21ab4e |
Upstream patch: https://review.gluster.org/17417
|
|
|
21ab4e |
|
|
|
21ab4e |
For nameless lookups, nl-cache does not init frame local, so the cbk
|
|
|
21ab4e |
throws up messages like these flooding the logs, especially whenenver
|
|
|
21ab4e |
gfid lookup on '/' is done (i.e. loc.path="/" and loc.gfid=1).
|
|
|
21ab4e |
|
|
|
21ab4e |
[2017-05-30 04:35:31.628443] E [nl-cache.c:201:nlc_lookup_cbk]
|
|
|
21ab4e |
(-->/usr/lib64/glusterfs/3.8.4/xlator/performance/io-cache.so(+0x3d81)
|
|
|
21ab4e |
[0x7f0883005d81]
|
|
|
21ab4e |
-->/usr/lib64/glusterfs/3.8.4/xlator/performance/quick-read.so(+0x3127)
|
|
|
21ab4e |
[0x7f0882dfb127]
|
|
|
21ab4e |
-->/usr/lib64/glusterfs/3.8.4/xlator/performance/nl-cache.so(+0x4cd3)
|
|
|
21ab4e |
[0x7f08829e0cd3] ) 0-distrep-nl-cache: invalid argument: local [Invalid
|
|
|
21ab4e |
argument]
|
|
|
21ab4e |
|
|
|
21ab4e |
Fixed it.
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I21cb44a9d2a324617e43f46fed83c9a0942d3a0b
|
|
|
21ab4e |
BUG: 1459756
|
|
|
21ab4e |
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/107930
|
|
|
21ab4e |
Tested-by: Poornima Gurusiddaiah <pgurusid@redhat.com>
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/performance/nl-cache/src/nl-cache.c | 3 ++-
|
|
|
21ab4e |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/performance/nl-cache/src/nl-cache.c b/xlators/performance/nl-cache/src/nl-cache.c
|
|
|
21ab4e |
index 8a130dc..a72f039 100644
|
|
|
21ab4e |
--- a/xlators/performance/nl-cache/src/nl-cache.c
|
|
|
21ab4e |
+++ b/xlators/performance/nl-cache/src/nl-cache.c
|
|
|
21ab4e |
@@ -198,7 +198,8 @@ nlc_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
21ab4e |
local = frame->local;
|
|
|
21ab4e |
conf = this->private;
|
|
|
21ab4e |
|
|
|
21ab4e |
- GF_VALIDATE_OR_GOTO (this->name, local, out);
|
|
|
21ab4e |
+ if (!local)
|
|
|
21ab4e |
+ goto out;
|
|
|
21ab4e |
|
|
|
21ab4e |
/* Donot add to pe, this may lead to duplicate entry and
|
|
|
21ab4e |
* requires search before adding if list of strings */
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|