@@ -140,7 +140,6 @@ test="none"
140
140
create_and_mount_fs ()
141
141
{
142
142
143
- echo $disks
144
143
if [[ $disks == " grab_disks" ]]; then
145
144
results=` $TOOLS_BIN /grab_disks ${disks} `
146
145
if [ $? -ne 0 ]; then
@@ -157,15 +156,15 @@ create_and_mount_fs()
157
156
158
157
cd $to_home_root /$to_user
159
158
echo $disks > disks
160
- umount /perf1
159
+ umount -q /perf1
161
160
162
161
163
162
$TOOLS_BIN /lvm_create --devices " ${disks} " --lvm_vol hammerdb --lvm_grp hammerdb --wipefs
164
163
if [ $? -ne 0 ]; then
165
164
echo LVM create failed.
166
165
exit 1
167
166
fi
168
- mkdir /perf1
167
+ mkdir -p /perf1
169
168
$TOOLS_BIN /create_filesystem --fs_type $fs --mount_dir /perf1 --device /dev/hammerdb/hammerdb
170
169
if [ $? -ne 0 ]; then
171
170
echo filesystem create failed.
@@ -174,8 +173,8 @@ create_and_mount_fs()
174
173
175
174
if [[ $log_disks != " " ]]; then
176
175
log_disks=` echo $log_disks | sed " s/,/ /g" `
177
- umount /perf2
178
- mkdir /perf2
176
+ umount -q /perf2
177
+ mkdir -p /perf2
179
178
$TOOLS_BIN /lvm_create --devices " ${log_disks} " --lvm_vol log_hammerdb --lvm_grp log_hammerdb --wipefs
180
179
if [ $? -ne 0 ]; then
181
180
echo LVM create of log disk failed.
224
223
225
224
eval set --$opts
226
225
227
- echo testing now
228
226
while [[ $# -gt 0 ]]; do
229
227
case " $1 " in
230
228
--disks)
@@ -319,9 +317,9 @@ rm -f results_pbench.tar
319
317
320
318
tmp_file=` mktemp /tmp/hammer_data.XXXXX`
321
319
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
323
321
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
325
323
rm $tmp_file
326
324
327
325
if [[ $to_tuned_setting != " none" ]]; then
0 commit comments