52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
|
From b68fa363c5981441c20fbc78b6dc00437bd698a7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mohit Agrawal <moagrawa@redhat.com>
|
||
|
|
Date: Mon, 22 Jun 2020 11:35:29 +0530
|
||
|
|
Subject: [PATCH 390/392] tests: Avoid ssl-authz.t failure
|
||
|
|
|
||
|
|
Problem: ssl-authz.t is failing at the time of checking memory
|
||
|
|
consumption if brick is consuming more than 5M
|
||
|
|
|
||
|
|
Solution: Update the check to avoid a failure.
|
||
|
|
|
||
|
|
> Change-Id: Iffb031f0695a7da83d5a2f6bac8863dad225317e
|
||
|
|
> Fixes: bz#1811631
|
||
|
|
> Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
|
||
|
|
> Reviewd on upstream link https://review.gluster.org/#/c/glusterfs/+/24221/)
|
||
|
|
> (Cherry pick from commit fb20713b380e1df8d7f9e9df96563be2f9144fd6)
|
||
|
|
|
||
|
|
BUG: 1848894
|
||
|
|
Change-Id: I4fc5d2e2597abfafc1e26d908c8c4184ab82afd5
|
||
|
|
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
||
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/203844
|
||
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||
|
|
---
|
||
|
|
tests/features/ssl-authz.t | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t
|
||
|
|
index 132b598..ab05c49 100755
|
||
|
|
--- a/tests/features/ssl-authz.t
|
||
|
|
+++ b/tests/features/ssl-authz.t
|
||
|
|
@@ -67,13 +67,15 @@ echo "Memory consumption for glusterfsd process"
|
||
|
|
for i in $(seq 1 100); do
|
||
|
|
gluster v heal $V0 info >/dev/null
|
||
|
|
done
|
||
|
|
+#Wait to cleanup memory
|
||
|
|
+sleep 10
|
||
|
|
|
||
|
|
end=`pmap -x $glusterfsd_pid | grep total | awk -F " " '{print $4}'`
|
||
|
|
diff=$((end-start))
|
||
|
|
|
||
|
|
-# If memory consumption is more than 5M some leak in SSL code path
|
||
|
|
+# If memory consumption is more than 15M some leak in SSL code path
|
||
|
|
|
||
|
|
-TEST [ $diff -lt 5000 ]
|
||
|
|
+TEST [ $diff -lt 15000 ]
|
||
|
|
|
||
|
|
|
||
|
|
# Set ssl-allow to a wildcard that includes our identity.
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|