Upaating the kit to use autoconf, and to build RPMs. Thanks and praise

to Michael MacDonald for some examples

diff --git a/lustre-iokit/AUTHORS b/lustre-iokit/AUTHORS
new file mode 100644 (file)
index 0000000..f0f587a
--- /dev/null
+++ b/lustre-iokit/AUTHORS
@@ -0,0 +1,5 @@
+Phil Schwan
+Eric Barton <eeb@clusterfs.com>
+Jody McIntyre <scjody@clusterfs.com>
+Michael MacDonald <mjmac@clusterfs.com>
+Cliff White <cliffw@clusterfs.com>

diff --git a/lustre-iokit/ChangeLog b/lustre-iokit/ChangeLog
new file mode 100644 (file)
index 0000000..86f6596
--- /dev/null
+++ b/lustre-iokit/ChangeLog
@@ -0,0 +1 @@
+2006-10-31 - Borrowing mjmac's most excellent work and setting up autogen/RPM

diff --git a/lustre-iokit/autogen.sh b/lustre-iokit/autogen.sh
new file mode 100644 (file)
index 0000000..fddf52d
--- /dev/null
+++ b/lustre-iokit/autogen.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+fatal() {
+    local msg=$1
+
+    echo "FATAL: $msg"
+    exit 1
+}
+
+run_cmd() {
+    local cmd=$1
+
+    echo "Running $cmd..."
+    $cmd || fatal "$cmd failed!"
+}
+
+run_cmd aclocal
+run_cmd "automake -a -c"
+run_cmd autoconf
+
+echo "Finished.  Ready for ./configure ..."

diff --git a/lustre-iokit/configure.ac b/lustre-iokit/configure.ac
new file mode 100644 (file)
index 0000000..01114fb
--- /dev/null
+++ b/lustre-iokit/configure.ac
@@ -0,0 +1,15 @@
+AC_INIT
+AM_INIT_AUTOMAKE(lustre-iokit,1.0)
+AC_PATH_PROGS(BASH, bash)
+AC_PATH_PROGS(PERL, perl)
+RELEASE="`date +%Y%m%d%H%M`"
+AC_SUBST(RELEASE)
+
+AC_OUTPUT(
+lustre-iokit.spec
+Makefile
+sgpdd-survey/Makefile
+obdfilter-survey/Makefile
+ost-survey/Makefile
+ior-survey/Makefile
+)

diff --git a/lustre-iokit/ior-survey/IOR-2.8.6.tar.gz b/lustre-iokit/ior-survey/IOR-2.8.6.tar.gz
deleted file mode 100644 (file)
index d934ad4..0000000
Binary files a/lustre-iokit/ior-survey/IOR-2.8.6.tar.gz and /dev/null differ

diff --git a/lustre-iokit/ior-survey/IOR-2.9.1.tar.gz b/lustre-iokit/ior-survey/IOR-2.9.1.tar.gz
new file mode 100644 (file)
index 0000000..fcea36f
Binary files /dev/null and b/lustre-iokit/ior-survey/IOR-2.9.1.tar.gz differ

diff --git a/lustre-iokit/ior-survey/Makefile.am b/lustre-iokit/ior-survey/Makefile.am
new file mode 100644 (file)
index 0000000..d6ac265
--- /dev/null
+++ b/lustre-iokit/ior-survey/Makefile.am
@@ -0,0 +1,3 @@
+bin_SCRIPTS = ior-survey parse-ior.pl
+CLEANFILE = $(bin_SCRIPTS)
+EXTRA_DIST = README.ior-survey ior-survey parse-ior.pl

diff --git a/lustre-iokit/ior-survey/README b/lustre-iokit/ior-survey/README.ior-survey
similarity index 100%
rename from lustre-iokit/ior-survey/README
rename to lustre-iokit/ior-survey/README.ior-survey

diff --git a/lustre-iokit/lustre-iokit.spec.in b/lustre-iokit/lustre-iokit.spec.in
new file mode 100644 (file)
index 0000000..49c955a
--- /dev/null
+++ b/lustre-iokit/lustre-iokit.spec.in
@@ -0,0 +1,39 @@
+# lustre-iokit.spec
+%define name @PACKAGE@
+%define version @VERSION@
+%define release @RELEASE@
+%define libdir %{_datadir}/%{name}
+%define bindir %{_sbindir}
+
+Summary: Lustre IOkit - Benchmark Tools
+Name: %{name}
+Version: %{version}
+Release: %{release}
+License: CFS
+Group: Applications/System
+Source: %{name}-%{version}.tar.gz
+URL: http://clusterfs.com/
+BuildRoot: /var/tmp/%{name}-%{version}-root
+Provides: %{name} = %{version}
+BuildArch: noarch
+
+%description
+A set of wrapper scripts for testing the Lustre filesystem and it's components.
+
+%prep
+%setup -qn %{name}-%{version}
+
+%build
+rm -fr $RPM_BUILD_ROOT
+./configure --prefix=/usr
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+cat > %{name}.files <<EOF
+%attr(-, root, root) %{bindir}/*
+%attr(-, root, root) %{libdir}/*
+EOF
+
+%files -f %{name}.files

diff --git a/lustre-iokit/obdfilter-survey/Makefile.am b/lustre-iokit/obdfilter-survey/Makefile.am
new file mode 100644 (file)
index 0000000..2caa763
--- /dev/null
+++ b/lustre-iokit/obdfilter-survey/Makefile.am
@@ -0,0 +1,3 @@
+bin_SCRIPTS = echo.sh obdfilter-survey obparse.pl
+CLEANFILE = $(bin_SCRIPTS)
+EXTRA_DIST = README.obdfilter-survey echo.sh obdfilter-survey obparse.pl

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

diff --git a/lustre-iokit/ost-survey/Makefile.am b/lustre-iokit/ost-survey/Makefile.am
new file mode 100644 (file)
index 0000000..e24be74
--- /dev/null
+++ b/lustre-iokit/ost-survey/Makefile.am
@@ -0,0 +1,3 @@
+bin_SCRIPTS = ost-survey.pl plot-ost.pl
+CLEANFILE = $(bin_SCRIPTS)
+EXTRA_DIST = README.ost-survey ost-survey.pl plot-ost.pl

diff --git a/lustre-iokit/ost-survey/README b/lustre-iokit/ost-survey/README.ost-survey
similarity index 66%
rename from lustre-iokit/ost-survey/README
rename to lustre-iokit/ost-survey/README.ost-survey
index 9f75664..1541939 100644 (file)
--- a/lustre-iokit/ost-survey/README
+++ b/lustre-iokit/ost-survey/README.ost-survey
@@ -24,16 +24,3 @@ ost-survey script using gnuplot.
 Syntax: $ ost-survey /mnt/lustre > ost_log
        $ plot-ost.pl ost_log
 
-
-
-
-
-
-Some sample test results:
-Ost#  Read(MB/s)  Write(MB/s)  Read-time  Write-time
-----------------------------------------------------
-0     12.080       18.382        2.483      1.632      Local Firewire IDE
-1     15.043       43.289        1.994      0.693      Local IDE
-2     22.546       25.252        1.331      1.188      Local loopback
-0      8.896       17.370        3.372      1.727       GigE to above disks
-

diff --git a/lustre-iokit/sgpdd-survey/Makefile.am b/lustre-iokit/sgpdd-survey/Makefile.am
new file mode 100644 (file)
index 0000000..31e0b77
--- /dev/null
+++ b/lustre-iokit/sgpdd-survey/Makefile.am
@@ -0,0 +1,3 @@
+bin_SCRIPTS = parse-sgpdd.pl sgpdd-survey
+CLEANFILE = $(bin_SCRIPTS)
+EXTRA_DIST = README.sgpdd-survey parse-sgpdd.pl sgpdd-survey

diff --git a/lustre-iokit/sgpdd-survey/README b/lustre-iokit/sgpdd-survey/README.sgpdd-survey
similarity index 100%
rename from lustre-iokit/sgpdd-survey/README
rename to lustre-iokit/sgpdd-survey/README.sgpdd-survey