X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fyaml.sh;h=202fed36894657841e50245070930a474ba01fba;hb=e1cf0bdf5df70824c92586ca46e36088e80215d5;hp=e3d9c8f7574375145c4b2662ff3a9848b7bf1966;hpb=5d37670e8507563db556879041c7992936aefa56;p=fs%2Flustre-release.git

diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh
index e3d9c8f..202fed3 100644
--- a/lustre/tests/yaml.sh
+++ b/lustre/tests/yaml.sh
@@ -17,10 +17,10 @@ yml_nodes_file() {
     export logdir=$1
 
     if [ -f $logdir/shared ]; then
-        do_rpc_nodes $(comma_list $(nodes_list)) \
+        do_rpc_nodes $(comma_list $(all_nodes)) \
             "yml_node >> $logdir/node.\\\$(hostname -s).yml"
     else
-        do_rpc_nodes $(comma_list $(nodes_list)) yml_node | split_output
+        do_rpc_nodes $(comma_list $(all_nodes)) yml_node | split_output
     fi
     yml_entities
 }
@@ -73,24 +73,36 @@ yml_code_review() {
 }
 
 release() {
-   if [ -r /etc/lsb-release ]; then
-      dist=$(grep 'DISTRIB_ID' /etc/lsb-release | sed 's/DISTRIB_ID=//' | head -1)
-   elif [ -r /etc/redhat-release ]; then
-       dist=$(awk '/release/ { printf("%s %s %s", $1, $2, $3)}' /etc/redhat-release)
-   elif [ -r /etc/*-release ]; then
-       dist=$(find /etc/ -maxdepth 1 -name '*release' 2> /dev/null | \
-           sed -e 's/\/etc\///' -e 's/-release//' | head -1)
-   else
-       dist="UNKNOWN"
-   fi
-
-   echo $dist
+	if [ -r /etc/SuSE-release ]; then
+		name=$(awk '/SUSE/ { printf("%s %s %s %s", $1, $2, $3, $4) }' \
+			/etc/SuSE-release)
+		version=$(sed -n -e 's/^VERSION = //p' /etc/SuSE-release)
+		level=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
+		dist="${name} ${version}.${level}"
+	elif [ -r /etc/os-release ]; then
+		name=$(sed -n -e 's/"//g' -e 's/^NAME=//p' /etc/os-release)
+		version=$(sed -n -e 's/"//g' -e 's/^VERSION_ID=//p' \
+			/etc/os-release)
+		dist="${name} ${version}"
+	elif [ -r /etc/system-release ]; then
+		dist=$(awk '/release/ \
+			{ printf("%s %s %s", $1, $2, $3) }' \
+			/etc/system-release)
+	elif [ -r /etc/*-release ]; then
+		dist=$(find /etc/ -maxdepth 1 -name '*release' 2> /dev/null | \
+			sed -e 's/\/etc\///' -e 's/-release//' | head -n1)
+	else
+		dist="UNKNOWN"
+	fi
+
+	echo $dist
 }
 
 yml_build_info() {
-    TEST_DISTRO=$(release)
-    LUSTRE_VERSION=$(lctl lustre_build_version | awk '/Lustre version:/ {print $3}')
-    LUSTRE_BUILD=${LUSTRE_BUILD_SOURCE:-$(sed 's/-.*//' <<<$LUSTRE_VERSION)}
+	local TEST_DISTRO=$(release)
+	local LUSTRE_VERSION=$(lustre_build_version)
+	local LUSTRE_BUILD=${LUSTRE_BUILD_SOURCE:-$LUSTRE_VERSION}
+	local FILE_SYSTEM=$(node_fstypes $(hostname -s))
 
 cat <<EOF
     lbats_build_id: $LBATS_ID
@@ -100,7 +112,10 @@ cat <<EOF
     os_distribution: $TEST_DISTRO
     lustre_version: $LUSTRE_VERSION
     lustre_build: $LUSTRE_BUILD
+    lustre_branch: $LUSTRE_BRANCH
+    lustre_revision: $LUSTRE_REVISION
     kernel_version: $(uname -r)
+    file_system: ${FILE_SYSTEM:-"NA"}
 EOF
 }
 
@@ -127,23 +142,43 @@ EOF
 }
 
 yml_entities() {
-    local host
-    for num in $(seq $MDSCOUNT); do
-        host=$(short_hostname $(facet_active_host mds$num))
-        yml_entity "MDS $num" $host >> $logdir/node.$host.yml
-    done
-
-    for num in $(seq $OSTCOUNT); do
-        host=$(short_hostname $(facet_active_host ost$num))
-        yml_entity "OST $num" $host >> $logdir/node.$host.yml
-    done
-
-    i=1
-    for host in ${CLIENTS//,/ }; do
-        host=$(short_hostname $host)
-        yml_entity "Client $i" $host >> $logdir/node.$host.yml
-        i=$((i+1))
-    done
+	local host
+	local f_host
+	local i
+
+	if ! combined_mgs_mds; then
+		host=$(short_hostname $(facet_active_host mgs))
+		f_host=$(short_hostname $(facet_passive_host mgs))
+
+		yml_entity "MGS" $host >> $logdir/node.$host.yml
+		[[ -n $f_host ]] &&
+			yml_entity "MGS" $f_host >> $logdir/node.$f_host.yml
+	fi
+
+	for i in $(seq $MDSCOUNT); do
+		host=$(short_hostname $(facet_active_host mds$i))
+		f_host=$(short_hostname $(facet_passive_host mds$i))
+
+		yml_entity "MDS $i" $host >> $logdir/node.$host.yml
+		[[ -n $f_host ]] &&
+			yml_entity "MDS $i" $f_host >> $logdir/node.$f_host.yml
+	done
+
+	for i in $(seq $OSTCOUNT); do
+		host=$(short_hostname $(facet_active_host ost$i))
+		f_host=$(short_hostname $(facet_passive_host ost$i))
+
+		yml_entity "OST $i" $host >> $logdir/node.$host.yml
+		[[ -n $f_host ]] &&
+			yml_entity "OST $i" $f_host >> $logdir/node.$f_host.yml
+	done
+
+	i=1
+	for host in ${CLIENTS//,/ }; do
+		host=$(short_hostname $host)
+		yml_entity "Client $i" $host >> $logdir/node.$host.yml
+		i=$((i+1))
+	done
 }
 
 yml_log_test() {