17b94a
From ff5f06d6ba5ac87094ae5df435d1cfb38802e7ca Mon Sep 17 00:00:00 2001
17b94a
From: N Balachandran <nbalacha@redhat.com>
17b94a
Date: Tue, 18 Jun 2019 15:33:29 +0530
17b94a
Subject: [PATCH 213/221] cluster/dht: Strip out dht xattrs
17b94a
17b94a
Some internal DHT xattrs were not being
17b94a
removed when calling getxattr in pass-through mode.
17b94a
This has been fixed.
17b94a
17b94a
upstream patch: https://review.gluster.org/#/c/glusterfs/+/22889/
17b94a
17b94a
>Change-Id: If7e3dbc7b495db88a566bd560888e3e9c167defa
17b94a
>fixes: bz#1721435
17b94a
>Signed-off-by: N Balachandran <nbalacha@redhat.com>
17b94a
17b94a
17b94a
BUG: 1721357
17b94a
Change-Id: I29bce7ea78bb4fd3b493404282cb2c48ef0bf4ee
17b94a
Signed-off-by: N Balachandran <nbalacha@redhat.com>
17b94a
Reviewed-on: https://code.engineering.redhat.com/gerrit/174699
17b94a
Tested-by: RHGS Build Bot <nigelb@redhat.com>
17b94a
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
17b94a
---
17b94a
 xlators/cluster/dht/src/dht-common.c | 2 ++
17b94a
 1 file changed, 2 insertions(+)
17b94a
17b94a
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
17b94a
index e1edb38..9a6ea5b 100644
17b94a
--- a/xlators/cluster/dht/src/dht-common.c
17b94a
+++ b/xlators/cluster/dht/src/dht-common.c
17b94a
@@ -11216,6 +11216,8 @@ dht_pt_getxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
17b94a
 
17b94a
     conf = this->private;
17b94a
     dict_del(xattr, conf->xattr_name);
17b94a
+    dict_del(xattr, conf->mds_xattr_key);
17b94a
+    dict_del(xattr, conf->commithash_xattr_name);
17b94a
 
17b94a
     if (frame->root->pid >= 0) {
17b94a
         GF_REMOVE_INTERNAL_XATTR("trusted.glusterfs.quota*", xattr);
17b94a
-- 
17b94a
1.8.3.1
17b94a