From: Oleg Drokin <green@whamcloud.com>
Date: Thu, 28 Feb 2019 04:40:37 +0000 (-0500)
Subject: LU-12030 tests: Properly detect debug kernel use on rhel7.6
X-Git-Tag: 2.12.5-RC1~23
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F38572%2F4;p=fs%2Flustre-release.git

LU-12030 tests: Properly detect debug kernel use on rhel7.6

kmalloc-128 slab seems to be gone, so let's use dma-kmalloc-128
instead.

Lustre-commit: 673e8b0b3c404b14a02e7e874c3aed991bc52eb3
Lustre-change: https://review.whamcloud.com/34342

Test-Parameters: trivial testlist=conf-sanity env=ONLY=63
Signed-off-by: Oleg Drokin <green@whamcloud.com>
Change-Id: Ice7f350ba2bc6cc733c0a98b0037e6f0980216c9
Reviewed-on: https://review.whamcloud.com/38572
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index ca12bbd..fc0435d 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4622,7 +4622,7 @@ test_63() {
 	# If kmalloc-128 is also 1 per page - this is a debug kernel
 	# and so this is not an error.
 	local kmalloc128=$(do_facet $SINGLEMDS "cat /proc/slabinfo" |
-			   awk '/^(kmalloc|size)-128 / { print $5 / $6 }')
+			   awk '/^(dma-kmalloc|size)-128 / { print $5 / $6 }')
 	# 32 128-byte chunks in 4k
 	[ "${kmalloc128%.*}" -lt "32" ] ||
 		error "ldiskfs inode too big, only $inode_slab objs/page, " \