b=11171

fix rpm
rename libobd to libecho

diff --git a/lustre-iokit/lustre-iokit.spec.in b/lustre-iokit/lustre-iokit.spec.in
index 3c06193..44d04df 100644 (file)
--- a/lustre-iokit/lustre-iokit.spec.in
+++ b/lustre-iokit/lustre-iokit.spec.in
@@ -52,7 +52,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files
 /usr/bin/ior-survey
 /usr/bin/parse-ior
 %files
 /usr/bin/ior-survey
 /usr/bin/parse-ior

-/usr/bin/create-echoclient
+/usr/bin/libecho

 /usr/bin/obdfilter-survey
 /usr/bin/obparse
 /usr/bin/plot-ost
 /usr/bin/obdfilter-survey
 /usr/bin/obparse
 /usr/bin/plot-ost

diff --git a/lustre-iokit/obdfilter-survey/Makefile.am b/lustre-iokit/obdfilter-survey/Makefile.am
index e35f831..250a2e9 100644 (file)
--- a/lustre-iokit/obdfilter-survey/Makefile.am
+++ b/lustre-iokit/obdfilter-survey/Makefile.am
@@ -1,3 +1,3 @@
-bin_SCRIPTS = create-echoclient obdfilter-survey obparse
+bin_SCRIPTS = obdfilter-survey libecho obparse

 CLEANFILE = $(bin_SCRIPTS)
 CLEANFILE = $(bin_SCRIPTS)

-EXTRA_DIST = README.obdfilter-survey create-echoclient obdfilter-survey obparse
+EXTRA_DIST = README.obdfilter-survey obdfilter-survey libecho obparse

diff --git a/lustre-iokit/obdfilter-survey/create-echoclient b/lustre-iokit/obdfilter-survey/create-echoclient
deleted file mode 100755 (executable)
index 822f061..0000000
--- a/lustre-iokit/obdfilter-survey/create-echoclient
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-# This script will create a Lustre .xml configuration consisting
-# of echo client/servers for use with the obdfilter-survey test
-
-#######################################################################
-# Customisation variables
-#######################################################################
-
-config=$(basename $0 .sh).xml
-
-SERVERS=${SERVERS:-$(uname -n)}
-
-NETS=${NETS:-tcp}
-
-LMC=lmc
-VERBOSE=1
-BATCH=/tmp/lmc-batch.$$
-
-#######################################################################
-# some helpers: actual config below
-#######################################################################
-
-h2elan () {
-     echo $1 | sed 's/[^0-9]*//g'
-}
-
-_LMC="${LMC} -m $config"
-
-_lmc () {
-     if [ $VERBOSE ]; then echo "$@"; fi
-     if [ -n "$BATCH" ]; then
-       echo "$@" >> $BATCH
-     else
-       $_LMC "$@"
-     fi
-}
-
-config_end () {
-     [ -n "$BATCH" ] && $_LMC --batch $BATCH
-     cleanup
-}
-
-cleanup () {
-     [ -n "$BATCH" ] && rm -f $BATCH
-}
-
-ABORT_ON="ERR QUIT INT HUP"
-
-abort () {
-     trap - EXIT $ABORT_ON
-     echo "Error/Interrupt creating $config"
-     cleanup
-     exit 1
-}
-
-trap config_end EXIT
-trap abort      $ABORT_ON
-
-[ -f $config ] && rm $config
-
-####################################################################
-# the actual config
-####################################################################
-
-# client net
-_lmc --node client --add net --nettype lnet --nid '*'
-
-for srv in $SERVERS; do
-     for net in $NETS; do
-       case $net in
-           elan*) nid=`h2elan $srv`;;
-           gm*)   nid=`gmnalnid -n $srv`;;
-           *)     nid=$srv;;
-       esac
-       _lmc --node $srv --add net --nettype lnet --nid ${nid}@${net}
-     done
-
-     _lmc --node $srv --add ost --ost ost_$srv --osdtype=obdecho
-
-     _lmc --node client --add echo_client --ost ost_$srv
-done

diff --git a/lustre-iokit/obdfilter-survey/libobd b/lustre-iokit/obdfilter-survey/libecho
similarity index 100%
rename from lustre-iokit/obdfilter-survey/libobd
rename to lustre-iokit/obdfilter-survey/libecho

diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index 02a4298..2d85b8f 100755 (executable)
--- a/lustre-iokit/obdfilter-survey/obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/obdfilter-survey
@@ -36,7 +36,7 @@
 #  client systems on which this test runs.]
 
 # include library 
 #  client systems on which this test runs.]
 
 # include library 

-source libobd
+source libecho

 
 # create a set of objects, check there are 'n' contiguous ones and
 # return the first or 'ERROR'
 
 # create a set of objects, check there are 'n' contiguous ones and
 # return the first or 'ERROR'