%bcond_without ldiskfs
%bcond_with zfs
%bcond_without lustre_tests
+%bcond_without lustre_iokit
%if %{without servers}
# --without servers overrides --with {ldiskfs|zfs}
# of %kversion
%define krequires %(bash -c "echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
-%define sles10 %(bash -c "if [ "%sles_version" = "10" ]; then echo -n '1'; else echo -n '0'; fi")
-
-%if %sles10
-%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'")
-%endif
-
# Set the package name prefix
%if %{undefined lustre_name}
%if %{with servers}
AutoReqProv: no
%else
# for SLES11, we need nothing here
-# for SLES10, we need (where %{flavor} is, i.e. smp):
-%if %sles10
-Requires: kernel-%{flavor}
-%else
%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
# for RHEL we need to require the specific kernel still since weak-modules
# support on RH is, well, weak, to be punny about it
Requires: kernel = %{krequires}
%endif
%endif
-%endif
Group: Development/Kernel
%description modules
Summary: Lustre testing framework
Group: Development/Kernel
Provides: %{name}-tests = %{version}
-Requires: %{name} = %{version}, %{name}-modules = %{version}
+Requires: %{name} = %{version}, %{name}-modules = %{version}, lustre-iokit
%description tests
This package contains a set of test binaries and scripts that are intended
to be used by the Lustre testing framework.
+%if %{with lustre_iokit}
+%package -n lustre-iokit
+Summary: The Lustre IO-Kit is a collection of benchmark tools for a cluster with the Lustre file system.
+Group: Applications/System
+Requires: python > 2.2, sg3_utils
+
+%description -n lustre-iokit
+This package includes five tools:
+sgpdd-survey:
+A test of the 'bare metal' performance, bypassing as much of the kernel as we can. Uses the sgp_dd utility.
+
+obdfilter-survey
+This survey can be run in 3 modes to test disk I/O including the filesystem,
+network I/O, and disk I/O via the network. The script does sequential I/O
+with varying numbers of threads and objects (files) by using lctl::test_brw
+to drive the echo_client connected to local or remote obdfilter instances,
+or remote obdecho instances.
+
+ost-survey
+This survey tests the client-to-disk performance of individual OSTs, and
+ranks then for comparison.
+
+stats-collect
+This script will collect IO stats on a defined set of nodes.
+
+ior-survey:
+A script to run the IOR benchmark. The latest version can be downloaded from
+http://www.llnl.gov/asci/purple/benchmarks/limited/ior/
+
+mds-survey:
+This survey tests the local metadata performance using the echo_client to drive
+the MDD layer to perform operations. It is run with multiple threads (to
+simulate MDT service threads) locally on the MDS node, and does not need Lustre
+clients in order to run
+%endif
+
%if 0%{?suse_version}
%debug_package
%endif
%else
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests"
%endif
+%if %{without lustre_iokit}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit"
+%endif
# if %%kdir was given, make sure it's not in the configure arguments
if [ -n "%kdir" ]; then
cat >lustre.files <<EOF
%attr(-, root, root) %{?rootdir}/sbin/mount.lustre
%attr(-, root, root) %{_sbindir}/*
-%attr(-, root, root) %{_bindir}/*
+%attr(-, root, root) %{_bindir}/lfs
+%attr(-, root, root) %{_bindir}/lfs_migrate
+%attr(-, root, root) %{_bindir}/llbackup
+%attr(-, root, root) %{_bindir}/llobdstat
+%attr(-, root, root) %{_bindir}/llstat
+%attr(-, root, root) %{_bindir}/lustre_req_history
+%attr(-, root, root) %{_bindir}/mcreate
+%attr(-, root, root) %{_bindir}/munlink
+%attr(-, root, root) %{_bindir}/plot-llstat
+%attr(-, root, root) %{_bindir}/req_layout
%attr(-, root, root) %{_libdir}/libptlctl.a
%attr(-, root, root) %{_libdir}/liblustreapi.a
%attr(-, root, root) %{_libdir}/liblustreapi.so
%endif
%if %{with ldiskfs}
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
%endif
%if %{with zfs}
%if %{with ldiskfs}
%files osd-ldiskfs
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
%if %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh
%files tests -f lustre-tests.files
%endif
+%if %{with lustre_iokit}
+%files -n lustre-iokit
+%attr(-, root, root) %{_bindir}/ior-survey
+%attr(-, root, root) %{_bindir}/parse-ior
+%attr(-, root, root) %{_bindir}/libecho
+%attr(-, root, root) %{_bindir}/obdfilter-survey
+%attr(-, root, root) %{_bindir}/plot-obdfilter
+%attr(-, root, root) %{_bindir}/plot-ost
+%attr(-, root, root) %{_bindir}/ost-survey
+%attr(-, root, root) %{_bindir}/sgpdd-survey
+%attr(-, root, root) %{_bindir}/plot-sgpdd
+%attr(-, root, root) %{_bindir}/lstats.sh
+%attr(-, root, root) %{_bindir}/gather_stats_everywhere.sh
+%attr(-, root, root) %{_bindir}/config.sh
+%attr(-, root, root) %{_bindir}/mds-survey
+%doc lustre-iokit/obdfilter-survey/README.obdfilter-survey
+%doc lustre-iokit/ior-survey/README.ior-survey
+%doc lustre-iokit/ost-survey/README.ost-survey
+%doc lustre-iokit/mds-survey/README.mds-survey
+%doc lustre-iokit/sgpdd-survey/README.sgpdd-survey
+%doc lustre-iokit/stats-collect/README.lstats.sh
+%endif
+
%if %{defined rpm_post_base}
%post
if [ -x %{rpm_post_base}.sh ]; then
git://git.whamcloud.com / fs / lustre-release.git / blobdiff