[LU-589] test-packages launched by auster.sh read the wrong configuration file when auster.sh is invoked with the '-c' option

• Status: Resolved
• Project: Lustre
• Affects Version/s: Lustre 2.0.0, Lustre 2.1.0, Lustre 1.8.7, Lustre 1.8.6
• Fix Version/s: Lustre 2.8.0
• Type: Bug
• Priority: Minor
• Reporter: Chris Horn
• Assignee: WC Triage
• Resolution: Fixed
• Severity: 3

Description

auster.sh has the '-c' option to specify the location of an acceptance-small configuration file, however auster.sh doesn't export the corresponding CONFIG variable to test-package scripts which causes them to read the default 'local' configuration file.

Here I specify the configuration file /tmp/polluxp2_multi_node.sh

1. ./auster.sh -c /tmp/polluxp2_multi_node.sh sanity --only 1
   <snip>
   run_suite sanity /opt/cray/lustre-cray_gem_s/default/lib64/lustre/tests/sanity.sh

With 'set -x' set in sanity.sh we can see that it reads the wrong configuration file.

+ . /opt/cray/lustre-cray_gem_s/default/lib64/lustre/tests/cfg/local.sh

With the following change we can see the correct configuration file is read.

diff --git a/lustre/tests/auster.sh b/lustre/tests/auster.sh
index 39f5c62..91dcb7c 100755
— a/lustre/tests/auster.sh
+++ b/lustre/tests/auster.sh
@@ -69,7 +69,7 @@ export ${NAME:=local}
while getopts "c:d:nkf:g:i:rRslhv" opt
do
case "$opt" in

• c) CONFIG=$OPTARG;;
  + c) export CONFIG=$OPTARG;;
  d) test_logs_dir=$OPTARG/$(date +%Y-%m-%d)/$(date +%H%M%S);;
  D) test_logs_dir=$OPTARG;;
  g) test_group_file=$OPTARG;;

1. ./auster.sh -c /tmp/polluxp2_multi_node.sh sanity --only 1
   <snip>
   run_suite sanity /opt/cray/lustre-cray_gem_s/default/lib64/lustre/tests/sanity.sh

+ . /tmp/polluxp2_multi_node.sh

Comments

[Chris Horn]

Sorry. I guess one of these days I should learn the Jira markup. The diff is the following:

diff --git a/1.8.6/lustre/tests/auster.sh b/1.8.6/lustre/tests/auster.sh
index 39f5c62..91dcb7c 100644
--- a/1.8.6/lustre/tests/auster.sh
+++ b/1.8.6/lustre/tests/auster.sh
@@ -69,7 +69,7 @@ export ${NAME:=local}
 while getopts "c:d:D:nkf:g:i:rRslhv" opt
 do
     case "$opt" in
-       c) CONFIG=$OPTARG;;
+       c) export CONFIG=$OPTARG;;
        d) test_logs_dir=$OPTARG/$(date +%Y-%m-%d)/$(date +%H%M%S);;
        D) test_logs_dir=$OPTARG;;
        g) test_group_file=$OPTARG;;

[Andreas Dilger]

Chris Horn,
could you please submit this as a patch to Gerrit instead of an inline comment here in Jira. That will allow the patch to be tested and submitted into the upstream repository. Please submit a patch for the "master" branch in addition to the b1_8 branch, and paste the URLs for those Gerrit changes into a comment here for tracking purposes.

Thanks for your contribution to Lustre.

[Chris Horn]

Against master:
http://review.whamcloud.com/2051

Against b1_8:
http://review.whamcloud.com/2052

[Andreas Dilger]

Chris, can you please comment.

[Chris Horn]

Wow, I really lost track of this one... I've refreshed the master patch. Let me know if this is still wanted on b1_8.

[Gerrit Updater]

Oleg Drokin ([e-mail]) merged in patch http://review.whamcloud.com/2051/
Subject: LU-589 auster: Export 'CONFIG' environment variable.
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: 978aae23b5949bb97451c2ccbedabb26c30df813

[Joseph Gmitter (Inactive)]

Landed for 2.8.