From 6b514c0bd0e3f83cfb9f547148b6fc183db7c4c9 Mon Sep 17 00:00:00 2001 From: Vitaliy Kuznetsov Date: Fri, 10 Nov 2023 21:09:42 +0100 Subject: [PATCH] LU-16827 obdfilter: Fix "emfperf obdfilter-survey" error This patch fixes the definition of the lctl variable. It changes the logic so that the LCTL value is assigned only when it was defined earlier. Fixes: 91a3b286ba ("LU-16827 obdfilter: Fix obdfilter-survery/1a") Test-Parameters: trivial testlist=obdfilter-survey Signed-off-by: Vitaliy Kuznetsov Change-Id: I4dfd7e3d1f78208b33b897d8e6680e59b690014c Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53083 Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Tested-by: jenkins Tested-by: Maloo --- lustre-iokit/obdfilter-survey/obdfilter-survey | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey index 60143fb..9170ef8 100755 --- a/lustre-iokit/obdfilter-survey/obdfilter-survey +++ b/lustre-iokit/obdfilter-survey/obdfilter-survey @@ -338,7 +338,7 @@ if [ "$lustre_root" == " " ]; then fi if [ -z "$lustre_root" ]; then - lctl=$LCTL + lctl=${LCTL:-lctl} else lctl=${lustre_root}/utils/lctl fi -- 1.8.3.1