233933
From da53d9027d9426c0023176a42e0550d6ccccc941 Mon Sep 17 00:00:00 2001
233933
From: Susant Palai <spalai@redhat.com>
233933
Date: Mon, 22 Apr 2019 21:18:30 +0530
233933
Subject: [PATCH 114/124] core: fix hang issue in __gf_free
233933
233933
Currently GF_ASSERT is done under mem_accounting lock at some places.
233933
On a GF_ASSERT failure, gf_msg_callingfn is called which calls gf_malloc
233933
internally and it takes the same mem_accounting lock leading to deadlock.
233933
233933
This is a temporary fix to avoid any hang issue in master.
233933
https://review.gluster.org/#/c/glusterfs/+/22589/ is being worked on
233933
in the mean while so that GF_ASSERT can be used under mem_accounting
233933
lock.
233933
233933
> upstream patch : https://review.gluster.org/#/c/glusterfs/+/22600/
233933
233933
>Change-Id: I6d67f23979e7edd2695bdc6aab2997dae4a4060a
233933
>updates: bz#1700865
233933
>Signed-off-by: Susant Palai <spalai@redhat.com>
233933
233933
Change-Id: I6d67f23979e7edd2695bdc6aab2997dae4a4060a
233933
BUG: 1698728
233933
Signed-off-by: Susant Palai <spalai@redhat.com>
233933
Reviewed-on: https://code.engineering.redhat.com/gerrit/168474
233933
Tested-by: RHGS Build Bot <nigelb@redhat.com>
233933
Reviewed-by: Nithya Balachandran <nbalacha@redhat.com>
233933
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
233933
---
233933
 libglusterfs/src/mem-pool.c | 1 -
233933
 1 file changed, 1 deletion(-)
233933
233933
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
233933
index 81badc0..34cb87a 100644
233933
--- a/libglusterfs/src/mem-pool.c
233933
+++ b/libglusterfs/src/mem-pool.c
233933
@@ -348,7 +348,6 @@ __gf_free(void *free_ptr)
233933
 
233933
     LOCK(&mem_acct->rec[header->type].lock);
233933
     {
233933
-        GF_ASSERT(mem_acct->rec[header->type].size >= header->size);
233933
         mem_acct->rec[header->type].size -= header->size;
233933
         mem_acct->rec[header->type].num_allocs--;
233933
         /* If all the instances are freed up then ensure typestr is set
233933
-- 
233933
1.8.3.1
233933