|
 |
e7a346 |
From 717fab7db9afb3d2f512fcdb7a952eb57b67e8dd Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
e7a346 |
Date: Thu, 10 May 2018 16:54:44 +0530
|
|
|
e7a346 |
Subject: [PATCH 268/271] dht: Excessive 'dict is null' logs in
|
|
|
e7a346 |
dht_discover_complete
|
|
|
e7a346 |
|
|
|
e7a346 |
Problem: In Geo-Rep setup excessive "dict is null" logs in
|
|
|
e7a346 |
dht_discover_complete while xattr is NULL
|
|
|
e7a346 |
|
|
|
e7a346 |
Solution: To avoid the logs update a condition in dht_discover_complete
|
|
|
e7a346 |
|
|
|
e7a346 |
> BUG: 1576767
|
|
|
e7a346 |
> Change-Id: Ic7aad712d9b6d69b85b76e4fdf2881adb0512237
|
|
|
e7a346 |
> fixes: bz#1576767
|
|
|
e7a346 |
> (cherry pick from commit 08dcb1c2bf02bba313d3bfc8fbc1c8ea63296321)
|
|
|
e7a346 |
> (Upstream review link https://review.gluster.org/#/c/20001/)
|
|
|
e7a346 |
|
|
|
e7a346 |
BUG: 1565577
|
|
|
e7a346 |
Change-Id: I1b1327eeef05fa261c814069a3bdd75653b37bd1
|
|
|
e7a346 |
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/138490
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
xlators/cluster/dht/src/dht-common.c | 3 ++-
|
|
|
e7a346 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
|
|
|
e7a346 |
index ec1628a..feeaa3f 100644
|
|
|
e7a346 |
--- a/xlators/cluster/dht/src/dht-common.c
|
|
|
e7a346 |
+++ b/xlators/cluster/dht/src/dht-common.c
|
|
|
e7a346 |
@@ -748,7 +748,8 @@ cleanup:
|
|
|
e7a346 |
done:
|
|
|
e7a346 |
dht_set_fixed_dir_stat (&local->postparent);
|
|
|
e7a346 |
/* Delete mds xattr at the time of STACK UNWIND */
|
|
|
e7a346 |
- GF_REMOVE_INTERNAL_XATTR (conf->mds_xattr_key, local->xattr);
|
|
|
e7a346 |
+ if (local->xattr)
|
|
|
e7a346 |
+ GF_REMOVE_INTERNAL_XATTR (conf->mds_xattr_key, local->xattr);
|
|
|
e7a346 |
|
|
|
e7a346 |
DHT_STACK_UNWIND (lookup, main_frame, local->op_ret, local->op_errno,
|
|
|
e7a346 |
local->inode, &local->stbuf, local->xattr,
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|