commit dbench

Hello community, here is the log from the commit of package dbench checked in at Thu Oct 16 17:03:09 CEST 2008. -------- --- dbench/dbench.changes 2008-04-08 15:16:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbench/dbench.changes 2008-10-16 15:42:46.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Oct 16 15:41:44 CEST 2008 - vmarsik@suse.cz + +- added dependency on kernel-nfs-server for the ctcs2-glue subpackage + +------------------------------------------------------------------- +Fri Sep 26 18:11:34 CEST 2008 - vmarsik@suse.cz + +- added TCF for running on local NFS mount +- reverted Yi's renaming + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbench.spec ++++++ --- /var/tmp/diff_new_pack.w15869/_old 2008-10-16 17:03:04.000000000 +0200 +++ /var/tmp/diff_new_pack.w15869/_new 2008-10-16 17:03:04.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package dbench (Version 3.04) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,7 @@ Group: System/Benchmark AutoReqProv: on Version: 3.04 -Release: 112 +Release: 146 Summary: File System Benchmark Similar to Netbench Url: http://samba.org/ftp/tridge/dbench/ Source0: %{name}-%{version}.tar.bz2 @@ -40,7 +47,7 @@ License: GPL v2 or later Summary: File System Benchmark similar to Netbench Group: System/Benchmark -Requires: ctcs2 >= 0.1.1 +Requires: ctcs2 >= 0.1.1 dbench nfs-kernel-server #BuildArchitectures: noarch %description ctcs2-glue @@ -74,16 +81,17 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tools # install ctcs2 related files in the ctcs2-glue sub packages install -m 744 ctcstools/do_dbench $RPM_BUILD_ROOT/usr/share/qa/dbench/ -install -m 644 ctcstools/dbench-default.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-default.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf -install -m 644 ctcstools/dbench-default-v.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-default-v.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf -install -m 644 ctcstools/dbench-syncIO.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-syncIO.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf -install -m 644 ctcstools/dbench-syncIO-v.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf -ln -s ../../../../usr/share/qa/dbench/tcf/dbench-syncIO-v.tcf $RPM_BUILD_ROOT/usr/share/qa/tcf +install -m 744 ctcstools/do_dbench_nfs $RPM_BUILD_ROOT/usr/share/qa/dbench/ +install -m 644 ctcstools/dbench-*.tcf $RPM_BUILD_ROOT/usr/share/qa/dbench/tcf/ +for A in ctcstools/dbench-*.tcf +do + B=`basename $A` + ln -s ../../../../usr/share/qa/dbench/tcf/$B $RPM_BUILD_ROOT/usr/share/qa/tcf/ +done install -m 744 ctcstools/dbench-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools -install -m 744 ctcstools/dbench-run-v $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-run-old $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-nfs-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 ctcstools/dbench-nfs4-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools find $RPM_BUILD_ROOT/usr/share/dbench -name "*.txt" -type f -print0 | xargs -r -0 chmod a-x %clean @@ -106,6 +114,11 @@ /usr/lib/ctcs2 %changelog +* Thu Oct 16 2008 vmarsik@suse.cz +- added dependency on kernel-nfs-server for the ctcs2-glue subpackage +* Fri Sep 26 2008 vmarsik@suse.cz +- added TCF for running on local NFS mount +- reverted Yi's renaming * Tue Apr 08 2008 yxu@suse.de - renamed all filed done by vmarsik, with a -v suffix - return to old file name schema to keep integrity and continuity of dbench tables in QADB ++++++ dbench-ctcstools.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default-old.tcf new/ctcstools/dbench-default-old.tcf --- old/ctcstools/dbench-default-old.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-default-old.tcf 2005-12-05 16:19:45.000000000 +0100 @@ -0,0 +1,6 @@ +# run the default dbench test for 1 hour with 500 clients, including +# pre-check of feasibility of workdir and +# final tidy-up +# +fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 500 -t 3600 -D /abuild/dbench_dflt +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default.tcf new/ctcstools/dbench-default.tcf --- old/ctcstools/dbench-default.tcf 2005-12-05 16:19:45.000000000 +0100 +++ new/ctcstools/dbench-default.tcf 2008-06-03 18:27:52.000000000 +0200 @@ -2,5 +2,85 @@ # pre-check of feasibility of workdir and # final tidy-up # -fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 500 -t 3600 -D /abuild/dbench_dflt + +# original version: +#fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 32 -t 3600 -D /abuild/dbench_dflt +#wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 1 wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 2 +wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 4 +wait + +timer 1h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 8 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 12 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 16 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 20 +wait + +timer 2h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 24 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 32 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 40 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 48 +wait + +timer 4h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 56 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 64 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 96 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 128 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 192 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 256 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 384 +wait + +timer 8h +fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 500 +wait + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-default-v.tcf new/ctcstools/dbench-default-v.tcf --- old/ctcstools/dbench-default-v.tcf 2008-03-19 16:23:54.000000000 +0100 +++ new/ctcstools/dbench-default-v.tcf 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -# run the default dbench test for 1 hour with 500 clients, including -# pre-check of feasibility of workdir and -# final tidy-up -# - -# original version: -#fg 1 dbench_dflt /usr/share/qa/dbench/do_dbench -n 32 -t 3600 -D /abuild/dbench_dflt -#wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 1 -wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 2 -wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 4 -wait - -timer 1h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 8 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 12 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 16 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 20 -wait - -timer 2h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 24 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 32 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 40 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 48 -wait - -timer 4h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 56 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 64 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 96 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 128 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 192 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 256 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 384 -wait - -timer 8h -fg 1 dbench-default /usr/share/qa/dbench/do_dbench -n 500 -wait - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs4-default.tcf new/ctcstools/dbench-nfs4-default.tcf --- old/ctcstools/dbench-nfs4-default.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs4-default.tcf 2008-09-30 13:24:28.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs4-run new/ctcstools/dbench-nfs4-run --- old/ctcstools/dbench-nfs4-run 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs4-run 2008-09-30 13:17:38.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/bash + +CTCS2_DIR=/usr/lib/ctcs2 +TCF_DIR=/usr/share/qa/tcf + +$CTCS2_DIR/tools/run $TCF_DIR/dbench-nfs4-default.tcf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs4-syncIO.tcf new/ctcstools/dbench-nfs4-syncIO.tcf --- old/ctcstools/dbench-nfs4-syncIO.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs4-syncIO.tcf 2008-09-30 13:24:42.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "sync,no_wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs4 /usr/share/qa/dbench/do_dbench_nfs nfs4 "async" -o "-s" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs-default.tcf new/ctcstools/dbench-nfs-default.tcf --- old/ctcstools/dbench-nfs-default.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs-default.tcf 2008-09-30 13:23:57.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs-run new/ctcstools/dbench-nfs-run --- old/ctcstools/dbench-nfs-run 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs-run 2008-09-30 13:16:58.000000000 +0200 @@ -0,0 +1,6 @@ +#!/bin/bash + +CTCS2_DIR=/usr/lib/ctcs2 +TCF_DIR=/usr/share/qa/tcf + +$CTCS2_DIR/tools/run $TCF_DIR/dbench-nfs-default.tcf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-nfs-syncIO.tcf new/ctcstools/dbench-nfs-syncIO.tcf --- old/ctcstools/dbench-nfs-syncIO.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-nfs-syncIO.tcf 2008-09-30 13:24:15.000000000 +0200 @@ -0,0 +1,36 @@ +# run the dbench test on mounted nfs directory + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "sync,no_wdelay,no_subtree_check" -o "-s" 8 +wait + +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" -o "-s" 1 +wait +timer 1h +fg 1 dbench-nfs /usr/share/qa/dbench/do_dbench_nfs nfs "async" -o "-s" 8 +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run new/ctcstools/dbench-run --- old/ctcstools/dbench-run 2008-04-08 13:57:13.000000000 +0200 +++ new/ctcstools/dbench-run 2008-04-17 20:23:28.000000000 +0200 @@ -3,6 +3,8 @@ ctcsdir="/usr/lib/ctcs2" basedir="/usr/share/qa/dbench" +/etc/init.d/cron stop + $ctcsdir/tools/run $basedir/tcf/dbench-default.tcf sleep 120 $ctcsdir/tools/run $basedir/tcf/dbench-syncIO.tcf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run-old new/ctcstools/dbench-run-old --- old/ctcstools/dbench-run-old 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-run-old 2008-03-03 18:03:54.000000000 +0100 @@ -0,0 +1,9 @@ +#!/bin/sh + +ctcsdir="/usr/lib/ctcs2" +basedir="/usr/share/qa/dbench" + +$ctcsdir/tools/run $basedir/tcf/dbench-default-old.tcf +sleep 120 +$ctcsdir/tools/run $basedir/tcf/dbench-syncIO-old.tcf + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-run-v new/ctcstools/dbench-run-v --- old/ctcstools/dbench-run-v 2008-04-08 13:57:25.000000000 +0200 +++ new/ctcstools/dbench-run-v 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#!/bin/sh - -ctcsdir="/usr/lib/ctcs2" -basedir="/usr/share/qa/dbench" - -$ctcsdir/tools/run $basedir/tcf/dbench-default-v.tcf -sleep 120 -$ctcsdir/tools/run $basedir/tcf/dbench-syncIO-v.tcf - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO-old.tcf new/ctcstools/dbench-syncIO-old.tcf --- old/ctcstools/dbench-syncIO-old.tcf 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/dbench-syncIO-old.tcf 2005-12-05 16:19:45.000000000 +0100 @@ -0,0 +1,6 @@ +# run dbench with synchronous IO for 1 hour with 500 clients, including +# pre-check of feasibility of workdir and +# final tidy-up +# +fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO +wait diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO.tcf new/ctcstools/dbench-syncIO.tcf --- old/ctcstools/dbench-syncIO.tcf 2005-12-05 16:19:45.000000000 +0100 +++ new/ctcstools/dbench-syncIO.tcf 2008-06-03 18:28:40.000000000 +0200 @@ -2,5 +2,85 @@ # pre-check of feasibility of workdir and # final tidy-up # -fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO + +# original version: +#fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO +#wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 1 wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 2 +wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 4 +wait + +timer 1h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 8 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 12 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 16 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 20 +wait + +timer 2h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 24 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 32 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 40 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 48 +wait + +timer 4h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 56 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 64 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 96 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 128 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 192 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 256 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 384 +wait + +timer 8h +fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 +wait + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/dbench-syncIO-v.tcf new/ctcstools/dbench-syncIO-v.tcf --- old/ctcstools/dbench-syncIO-v.tcf 2008-03-19 16:23:04.000000000 +0100 +++ new/ctcstools/dbench-syncIO-v.tcf 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -# run dbench with synchronous IO for 1 hour with 500 clients, including -# pre-check of feasibility of workdir and -# final tidy-up -# - -# original version: -#fg 1 dbench_syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -t 3600 -D /abuild/dbench_syncIO -#wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 1 -wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 2 -wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 4 -wait - -timer 1h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 8 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 12 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 16 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 20 -wait - -timer 2h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 24 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 32 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 40 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 48 -wait - -timer 4h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 56 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 64 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 96 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 128 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 192 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 256 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 384 -wait - -timer 8h -fg 1 dbench-syncIO /usr/share/qa/dbench/do_dbench -o "-s" -n 500 -wait - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench new/ctcstools/do_dbench --- old/ctcstools/do_dbench 2008-03-12 13:36:59.000000000 +0100 +++ new/ctcstools/do_dbench 2008-03-03 18:58:57.000000000 +0100 @@ -139,7 +139,7 @@ exit "$exitcode" } else - mkdir -p "$workdir" || { + "$MKDIR" -p "$workdir" || { echo "Could not create working directory $workdir. Aborting..." kill $$ # invokes tidy_up } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench_nfs new/ctcstools/do_dbench_nfs --- old/ctcstools/do_dbench_nfs 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/do_dbench_nfs 2008-09-30 14:54:05.000000000 +0200 @@ -0,0 +1,72 @@ +#!/bin/bash + +# Usage: do_nfs_dbench "<nfs params without rw>" + +LOCALDIR=/tmp/nfs_bench +MOUNTDIR=/mnt/nfs_bench +NFSVER=$1 +EXPORTFS_PARAMS=$2 + +shift 2 + +if [ "$NFSVER" != "nfs4" -a "$NFSVER" != "nfs" ]; then + echo "I will use \"$NFSVER\" as type of mount, are you sure? Usual are nfs and nfs4." +fi + +#source libqainternal.lib.sh +PASSED=0 +FAILED=1 +set -u +trap "cleanup; exit $FAILED" TERM INT + +function usage() { + echo "usage: $0 \"<nfs params without rw>\" " + echo "example: $0 nfs \"sync, no_wdelay\" 4 -t 60" + exit $FAILED +} + +function init() { + mkdir -p "$LOCALDIR" + mkdir -p "$MOUNTDIR" + chmod 777 "$LOCALDIR" + if [ "$NFSVER" = "nfs4" ]; then + cp /etc/exports /etc/exports.nfs_dbench_$$ + echo "/ localhost(rw,no_subtree_check,fsid=0)" > /etc/exports + /etc/init.d/nfsserver stop > /dev/null 2>&1 + fi + /etc/init.d/nfsserver start > /dev/null 2>&1 + if ! exportfs -o "rw,$EXPORTFS_PARAMS" "localhost:$LOCALDIR" + then + echo "Cannot export '$EXPORTFS_PARAMS' to 'localhost:$LOCALDIR'" + exit $FAILED + fi + if ! mount -t $NFSVER "localhost:$LOCALDIR" "$MOUNTDIR" + then + echo "Cannot mount NFS directory" + exit $FAILED + fi +} + +function cleanup() { + umount "localhost:$LOCALDIR" + exportfs -u "localhost:$LOCALDIR" + /etc/init.d/nfsserver stop > /dev/null + rm -rf "$LOCALDIR" + rm -rf "$MOUNTDIR" + if [ "$NFSVER" = "nfs4" ]; then + mv /etc/exports.nfs_dbench_$$ /etc/exports + fi +} + +if [ $# -lt 1 ]; then + usage +fi + +init +echo "Starting dbench on nfs filesystem mounted with params:" +echo "NFS params: $EXPORTFS_PARAMS" +echo "NFS version: $NFSVER" +dbench -D "$MOUNTDIR" $@ +cleanup + +exit $PASSED diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench,v new/ctcstools/do_dbench,v --- old/ctcstools/do_dbench,v 1970-01-01 01:00:00.000000000 +0100 +++ new/ctcstools/do_dbench,v 2008-02-18 13:51:11.000000000 +0100 @@ -0,0 +1,284 @@ +head 1.7; +access; +symbols; +locks + vmarsik:1.7; strict; +comment @# @; + + +1.7 +date 2008.02.18.12.51.11; author vmarsik; state Exp; +branches; +next 1.5; + +1.5 +date 2008.02.18.12.51.11; author vmarsik; state Exp; +branches; +next 1.1; + +1.1 +date 2008.02.18.12.51.10; author vmarsik; state Exp; +branches; +next ; + + +desc +@Original +@ + + +1.7 +log +@dodbench_spare_file +@ +text +@#!/bin/bash +# +# +# Feature request: +# - Check whether a sufficient amount of disk space is available +# (~22 MB/client * 1000 clients) +# + yes: launch dbench test +# + no: exit 2 (= internal error in ctcs2) +# +# +# +# Script is intended to be invoked from within ctcs2 which captures +# stdout in its logfile --> no need for an extra log +# +# +# +# +exitcode=2 # (= internal error in ctcs2) + +# dbench test constants +default_workdir=/abuild/dbench +dbench_pid="" # for the time being +diskspace_per_client=22 # MByte +number_clients=1000 +runtime=3600 # seconds + + + +# ============ START aux functions ============== +# + +function usage() { + echo " +Usage: $0 [-h] [-D workdir] [-n nprocs] [-o dbench_options] + [-t #secs] [-v] + + to run the \"dbench\" Benchmark on this host + and to create a nice log. + +Options: + -D Specify the working directory (and thus, implicitly, + the device) for dbench (default: $default_workdir) + -h Print this help text and exit successfully + -n Number of processes dbench should start + (must be >=10 to avoid bad input; default: $number_clients) + -o Specify a string of options to pass through to dbench + Default: -s (do synchronous file IO only) + -t specify dbench runtime of #secs (default: $runtime) seconds. + -v be verbose (currently a no-op) +" + return 0 +} + + +invoked_tidy_up="" +function tidy_up() { + + if [ -z "$invoked_tidy_up" ] + then + # Guard against re-entrancy -- yes, it may cause a race + invoked_tidy_up="yes" + echo "$(date): Caught signal; waiting 15s for dbench childs..." + sleep 15 + echo " Overall runtime: $SECONDS seconds." + # This should be unnecessary: dbench itself will + # remove $workdir upon termination... + # + # echo "Backgrounding removal of $workdir and terminating..." + # rm -rf "$workdir" & + popd >/dev/null 2>&1 + exit "$exitcode" + fi # $invoked_tidy_up +} +# +# ============ END aux functions ============== + +# Runtime measurement +SECONDS=0 + +trap tidy_up 1 2 3 15 + +timestamp="$(date '+%y%m%d.%H%M%S')" +basename=dbench-"${timestamp}" +workdir="$default_workdir" +dbench_opts="" +# usage: dbench [OPTIONS] nprocs +# options: +# -v show version +# -t timelimit run time in seconds (default 600) +# -D directory base directory to run in +# -c loadfile set location of the loadfile +# -s synchronous file IO +# -S synchronous directories (mkdir, unlink...) +# -x enable EA support +# -T options set socket options for tbench + +# ===== Evaluate and check the commandline ========= +# # +while getopts hD:n:o:t:v optchar ; do + + case "$optchar" in + + h) usage + exit 0 ;; + D) workdir=$OPTARG ;; + n) [ "$OPTARG" -ge 10 ] && \ + number_clients="$OPTARG" ;; + o) dbench_opts="$dbench_opts $OPTARG" ;; + t) runtime=$OPTARG ;; + v) verbose=yes ;; + + *) usage + exit "$exitcode" ;; + esac +done +shift $((OPTIND - 1)) +# # +# ==== END: Evaluate and check the commandline ====== + + +# ==== Preparation: Create the working directory ===== +# +# Make the path absolute +[ "$workdir" = "${workdir#/}" ] && workdir="${PWD}"/"$workdir" +if [ -e "$workdir" ] +then + [ -d "$workdir" ] || { + echo "\$workdir: ${workdir} is not a directory. Aborting..." + exit "$exitcode" + } +else + mkdir -p "$workdir" || { + echo "Could not create working directory $workdir. Aborting..." + kill $$ # invokes tidy_up + } +fi + +[ -r "$workdir" -a -w "$workdir" -a -x "$workdir" ] || { + echo "\ +prepare_workdir: Working directory $workdir: +Needed access rights rwx not all set. Aborting..." + kill $$ # invokes tidy_up + } + +wtestfile="${workdir}/prepare_workdir.$$.$$" +echo "$wtestfile" > "$wtestfile" ; rm "$wtestfile" || { + echo "\ +Working directory $workdir: +Cannot create or remove files there (maybe filesystem full or read-only?) +Aborting..." + kill $$ # invokes tidy_up + } + +# ==== Preparation: Check disk space below $workdir, = +# abort in case of shortage +# +minfree="$((diskspace_per_client * number_clients))" # MByte +freespace="$(df -m "$workdir" | awk '/^\//{ print $4 }')" +# if empty, need to consult next line. +[ -n "$freespace" ] || freespace="$(df "$workdir" |\ + awk '/^\/dev/{ getline ; print $3 }')" +if [ "$?" -ne 0 -o -z "$freespace" ] +then + echo "\ +Unable to determine free space (needed: $minfree MByte) +available under $workdir . Non-local filesystem, maybe? +Aborting..." + kill $$ # invokes tidy_up +fi +if [ "$freespace" -lt "$minfree" ] +then + echo "\ +\"df\" shows less than the needed $minfree MByte +available under $workdir . Aborting..." + kill $$ # invokes tidy_up +fi +# +# ==== END Preparation =============================== + + +# Now DO IT. +# Script will be terminated by signal, as I don't know +# about how/whether dbench will terminate by itself. +# +exitcode=0 +echo "$(date): Launching command: +dbench $dbench_opts -t $runtime -D $workdir $number_clients +Working directory and device: +$(df $workdir) +" +dbench $dbench_opts -t "$runtime" -D "$workdir" "$number_clients" +# This code is reached only if dbench runs to termination rather +# than gets signalled +exitcode="$?" +echo "dbench run completed; SIGTERMing myself for tidyup..." +kill $$ + + +@ + + +1.5 +log +@fix-suse_cert-dependency.patch +@ +text +@d158 1 +a158 1 +freespace="$(df -m "$workdir" | awk '/^\/dev/{ print $4 }')" +@ + + +1.1 +log +@Initial revision +@ +text +@a18 1 +CERTLIB=/usr/lib/cert_tests.lib +a26 7 +# Collection of functions from time-honoured hardware certification +if [ -f "$CERTLIB" ] ; then + . "$CERTLIB" +else + >&2 echo -e "\a$0: Not found: needed $CERTLIB. Aborting..." + exit "$exitcode" +fi +d63 1 +a63 1 + "$SLEEP" 15 +d82 1 +a82 1 +timestamp="$(get_timestamp)" +d132 1 +a132 1 + "$MKDIR" -p "$workdir" || { +d146 1 +a146 1 +echo "$wtestfile" > "$wtestfile" ; "$RM" "$wtestfile" || { +d158 1 +a158 1 +freespace="$("$DF" -m "$workdir" | "$AWK" '/^\/dev/{ print $4 }')" +d160 2 +a161 2 +[ -n "$freespace" ] || freespace="$("$DF" "$workdir" |\ + "$AWK" '/^\/dev/{ getline ; print $3 }')" +d173 1 +a173 1 +$DF shows less than the needed $minfree MByte +@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org