Skip to content

Commit f1b0696

Browse files
authored
Merge pull request #28 from redhat-performance/quiet_down
Quiet usage messages
2 parents 77fde77 + 0233efa commit f1b0696

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

hammerdb/hammerdb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ test="none"
140140
create_and_mount_fs()
141141
{
142142

143-
echo $disks
144143
if [[ $disks == "grab_disks" ]]; then
145144
results=`$TOOLS_BIN/grab_disks ${disks}`
146145
if [ $? -ne 0 ]; then
@@ -157,15 +156,15 @@ create_and_mount_fs()
157156

158157
cd $to_home_root/$to_user
159158
echo $disks > disks
160-
umount /perf1
159+
umount -q /perf1
161160

162161

163162
$TOOLS_BIN/lvm_create --devices "${disks}" --lvm_vol hammerdb --lvm_grp hammerdb --wipefs
164163
if [ $? -ne 0 ]; then
165164
echo LVM create failed.
166165
exit 1
167166
fi
168-
mkdir /perf1
167+
mkdir -p /perf1
169168
$TOOLS_BIN/create_filesystem --fs_type $fs --mount_dir /perf1 --device /dev/hammerdb/hammerdb
170169
if [ $? -ne 0 ]; then
171170
echo filesystem create failed.
@@ -174,8 +173,8 @@ create_and_mount_fs()
174173

175174
if [[ $log_disks != "" ]]; then
176175
log_disks=`echo $log_disks | sed "s/,/ /g"`
177-
umount /perf2
178-
mkdir /perf2
176+
umount -q /perf2
177+
mkdir -p /perf2
179178
$TOOLS_BIN/lvm_create --devices "${log_disks}" --lvm_vol log_hammerdb --lvm_grp log_hammerdb --wipefs
180179
if [ $? -ne 0 ]; then
181180
echo LVM create of log disk failed.
@@ -224,7 +223,6 @@ fi
224223

225224
eval set --$opts
226225

227-
echo testing now
228226
while [[ $# -gt 0 ]]; do
229227
case "$1" in
230228
--disks)
@@ -319,9 +317,9 @@ rm -f results_pbench.tar
319317

320318
tmp_file=`mktemp /tmp/hammer_data.XXXXX`
321319
find -L $test -type f -exec grep -Iq . {} \; -print > $tmp_file
322-
echo "/usr/local/HammerDB/results_hammerdb_${test}.csv" >> $tmp_file
320+
#echo "/usr/local/${test}/results_hammerdb_*.csv" >> $tmp_file
323321
egrep "out|csv|report" $tmp_file | egrep -v "Hammerdb" | grep -v tcl | tar cf /tmp/results_hammerdb_${test}_${to_tuned_setting}.tar --files-from=/dev/stdin
324-
${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --tar_file /tmp/results_hammerdb_${test}_${to_tuned_setting}.tar --test_name $test_name_${test} --tuned_setting=$to_tuned_setting --version "None" --user $to_user
322+
${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --tar_file /tmp/results_hammerdb_${test}_${to_tuned_setting}.tar --test_name hammerdb_$test_name_${test} --tuned_setting=$to_tuned_setting --version "None" --user $to_user
325323
rm $tmp_file
326324

327325
if [[ $to_tuned_setting != "none" ]]; then

0 commit comments

Comments
 (0)