Hello community, here is the log from the commit of package dbench checked in at Thu Mar 13 12:04:03 CET 2008. -------- --- dbench/dbench.changes 2008-03-07 12:55:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/dbench/dbench.changes 2008-03-12 12:18:04.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 12 12:15:43 CET 2008 - yxu@suse.de + +- removed do_dbench,v in ctcstool source (it is not built anywhere) +- retrieving content from the old missing patch fixing_suse_cert_dependency, and integrated into source + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbench.spec ++++++ --- /var/tmp/diff_new_pack.Gd3626/_old 2008-03-13 12:03:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Gd3626/_new 2008-03-13 12:03:47.000000000 +0100 @@ -16,7 +16,7 @@ Group: System/Benchmark AutoReqProv: on Version: 3.04 -Release: 102 +Release: 104 Summary: File System Benchmark Similar to Netbench Url: http://samba.org/ftp/tridge/dbench/ Source0: %{name}-%{version}.tar.bz2 @@ -105,6 +105,9 @@ /usr/lib/ctcs2 %changelog +* Wed Mar 12 2008 yxu@suse.de +- removed do_dbench,v in ctcstool source (it is not built anywhere) +- retrieving content from the old missing patch fixing_suse_cert_dependency, and integrated into source * Fri Mar 07 2008 yxu@suse.de - submit the package to all distributions * Mon Mar 03 2008 vmarsik@suse.cz ++++++ dbench-ctcstools.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ctcstools/do_dbench new/ctcstools/do_dbench --- old/ctcstools/do_dbench 2008-03-03 18:58:57.000000000 +0100 +++ new/ctcstools/do_dbench 2008-03-12 13:36:59.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,v new/ctcstools/do_dbench,v --- old/ctcstools/do_dbench,v 2008-02-18 13:51:11.000000000 +0100 +++ new/ctcstools/do_dbench,v 1970-01-01 01:00:00.000000000 +0100 @@ -1,284 +0,0 @@ -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