From 50e4b61886c4ded7959aabcdeadd162ecea8ea69 Mon Sep 17 00:00:00 2001 From: Li Wei Date: Tue, 18 Dec 2012 22:40:49 +0800 Subject: [PATCH 1/1] LU-2471 tests: Fix facet_type() to recognise names like mds1_2 In conf-sanity 24a, mdsdevname() and mdsvdevname() are given facet numbers like "1_2". This causes facet_type() to be given facet names like "mds1_2", which it can not return the facet type "MDS". This patch fixes facet_type() to handle names like "mds1_2" properly. Signed-off-by: Li Wei Change-Id: I0203add5f6fdf089d5061ee48c6efca449db1a96 Reviewed-on: http://review.whamcloud.com/4849 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Wei Liu Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 1531c5d..7384e12 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -697,7 +697,7 @@ cleanup_gss() { facet_type() { local facet=$1 - echo -n $facet | sed -e 's/^fs[0-9]\+//' -e 's/[0-9]\+//' | + echo -n $facet | sed -e 's/^fs[0-9]\+//' -e 's/[0-9_]\+//' | tr '[:lower:]' '[:upper:]' } -- 1.8.3.1