#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/
264 Hakan Kuecuekyilmaz 2008-09-13
$HOSTNAME --> ${HOSTNAME}.
modified:
dbt2/include/host_caneland.inc
dbt2/include/host_lu0009.inc
dbt2/include/host_walldorf.inc
dbt2/machine_info.sh
dbt2/wait_for_dbt2_and_collect.sh
dbt2/weekly_dbt2_overview.sh
per-file messages:
dbt2/include/host_caneland.inc
$HOSTNAME --> ${HOSTNAME}.
dbt2/include/host_lu0009.inc
$HOSTNAME --> ${HOSTNAME}.
dbt2/include/host_walldorf.inc
$HOSTNAME --> ${HOSTNAME}.
dbt2/machine_info.sh
Added machine info for new Nehalem system.
dbt2/wait_for_dbt2_and_collect.sh
$HOSTNAME --> ${HOSTNAME}.
dbt2/weekly_dbt2_overview.sh
$HOSTNAME --> ${HOSTNAME}.
=== modified file 'dbt2/include/host_caneland.inc'
--- a/dbt2/include/host_caneland.inc 2008-09-04 14:11:10 +0000
+++ b/dbt2/include/host_caneland.inc 2008-09-12 22:05:34 +0000
@@ -38,7 +38,7 @@ PATCHES="$HOME/work/mysql/patches/falcon
BZR_BASE="$HOME/work/mysql-falcon/dbt2"
# Where to find the DBT2 for MySQL installation.
-DBT2_DIR="$HOME/work/mysql/dbt2-$HOSTNAME"
+DBT2_DIR="$HOME/work/mysql/dbt2-${HOSTNAME}"
# Where to find DBT2 test scripts.
DBT2_SCRIPTS="${DBT2_DIR}/scripts"
=== modified file 'dbt2/include/host_lu0009.inc'
--- a/dbt2/include/host_lu0009.inc 2008-09-04 14:11:10 +0000
+++ b/dbt2/include/host_lu0009.inc 2008-09-12 22:05:34 +0000
@@ -38,7 +38,7 @@ PATCHES="$HOME/work/mysql/patches/falcon
BZR_BASE="$HOME/work/mysql-falcon/dbt2"
# Where to find the DBT2 for MySQL installation.
-DBT2_DIR="$HOME/work/mysql/dbt2-$HOSTNAME"
+DBT2_DIR="$HOME/work/mysql/dbt2-${HOSTNAME}"
# Where to find DBT2 test scripts.
DBT2_SCRIPTS="${DBT2_DIR}/scripts"
=== modified file 'dbt2/include/host_walldorf.inc'
--- a/dbt2/include/host_walldorf.inc 2008-09-04 14:11:10 +0000
+++ b/dbt2/include/host_walldorf.inc 2008-09-12 22:05:34 +0000
@@ -38,7 +38,7 @@ PATCHES="$HOME/work/mysql/patches/falcon
BZR_BASE="$HOME/work/mysql-falcon/dbt2"
# Where to find the DBT2 for MySQL installation.
-DBT2_DIR="$HOME/work/mysql/dbt2-$HOSTNAME"
+DBT2_DIR="$HOME/work/mysql/dbt2-${HOSTNAME}"
# Where to find DBT2 test scripts.
DBT2_SCRIPTS="${DBT2_DIR}/scripts"
=== modified file 'dbt2/machine_info.sh'
--- a/dbt2/machine_info.sh 2008-09-12 21:57:02 +0000
+++ b/dbt2/machine_info.sh 2008-09-12 22:05:34 +0000
@@ -37,3 +37,8 @@ if [ x"$HOSTNAME" = x"walldorf" ]; then
echo ''
echo 'This is a two-way dual-core machine.'
fi
+
+if [ x"$HOSTNAME" = x"nehalem-1" ]; then
+ echo ''
+ echo 'This is a two-way quad-core machine with simultaneous multi-threading.'
+fi
=== modified file 'dbt2/wait_for_dbt2_and_collect.sh'
--- a/dbt2/wait_for_dbt2_and_collect.sh 2008-09-12 21:57:02 +0000
+++ b/dbt2/wait_for_dbt2_and_collect.sh 2008-09-12 22:05:34 +0000
@@ -17,7 +17,7 @@ HOSTNAME=$(hostname -s)
#
WORK="/data0/work/mysql"
BZR_BASE="$HOME/work/mysql-falcon/dbt2"
-PRODUCTION="hakank@stripped:~/public_html/$HOSTNAME"
+PRODUCTION="hakank@stripped:~/public_html/${HOSTNAME}"
#FALCON="$WORK/mysql-6.0"
FALCON="$WORK/mysql-6.0-falcon"
@@ -31,8 +31,8 @@ CONTROL="$FALCON/weekly_dbt2_overview_do
MAINTAINER_EMAIL='hakan@stripped'
CC_LIST=''
FAILED='Weekly DBT2 Overview failed'
-SUCCESS="Weekly DBT2 Overview on $HOSTNAME succeeded"
-GRAPH="$BZR_BASE/weekly_dbt2_runs/$HOSTNAME/w10/weekly_dbt2_overview_graph.png"
+SUCCESS="Weekly DBT2 Overview on ${HOSTNAME} succeeded"
+GRAPH="$BZR_BASE/weekly_dbt2_runs/${HOSTNAME}/w10/weekly_dbt2_overview_graph.png"
#
# Mail program to use. mail|mailx does not support -a (attachments),
@@ -64,7 +64,7 @@ while (! [ -a $CONTROL ] ); do
done
# Get machine info.
-cd $BZR_BASE/weekly_dbt2_runs/$HOSTNAME
+cd $BZR_BASE/weekly_dbt2_runs/${HOSTNAME}
../../machine_info.sh > machine_info.txt
# Get mysqld configuration.
@@ -79,25 +79,25 @@ if [ $? != 0 ]; then
echo 'Weekly DBT2 Overview failed' | mail -s '[WDO ERROR]' $MAINTAINER_EMAIL
else
# Synchronize remote repository. Exclude mix.log files, because they get quite big (~50MB).
- rsync -avz --delete --cvs-exclude --exclude '*_mix.log' $BZR_BASE/old_weekly_dbt2_runs/$HOSTNAME/ $PRODUCTION/
- rsync -avz --delete --cvs-exclude --exclude '*_mix.log' $BZR_BASE/weekly_dbt2_runs/$HOSTNAME/ $PRODUCTION/weekly_dbt2_overview/
+ rsync -avz --delete --cvs-exclude --exclude '*_mix.log' $BZR_BASE/old_weekly_dbt2_runs/${HOSTNAME}/ $PRODUCTION/
+ rsync -avz --delete --cvs-exclude --exclude '*_mix.log' $BZR_BASE/weekly_dbt2_runs/${HOSTNAME}/ $PRODUCTION/weekly_dbt2_overview/
rsync -avz --delete --cvs-exclude $BZR_BASE/include/ $PRODUCTION/weekly_dbt2_overview/include/
rsync -avz --delete --cvs-exclude $BZR_BASE/images/ $PRODUCTION/weekly_dbt2_overview/images/
rsync -avz --delete $BZR_BASE/dbt2.css $PRODUCTION/weekly_dbt2_overview/
- rsync -avz --delete $BZR_BASE/weekly_dbt2_runs/$HOSTNAME/dbt2_config.txt $PRODUCTION/weekly_dbt2_overview/
- rsync -avz --delete $BZR_BASE/weekly_dbt2_runs/$HOSTNAME/machine_info.txt $PRODUCTION/weekly_dbt2_overview/
+ rsync -avz --delete $BZR_BASE/weekly_dbt2_runs/${HOSTNAME}/dbt2_config.txt $PRODUCTION/weekly_dbt2_overview/
+ rsync -avz --delete $BZR_BASE/weekly_dbt2_runs/${HOSTNAME}/machine_info.txt $PRODUCTION/weekly_dbt2_overview/
rsync -avz --delete $BZR_BASE/process-stop.png $PRODUCTION/weekly_dbt2_overview/
rsync -avz --delete $BZR_BASE/weekly_dbt2_overview.php $PRODUCTION/weekly_dbt2_overview/
rsync -avz --delete $BZR_BASE/weekly_dbt2_overview.png $PRODUCTION/weekly_dbt2_overview/
if [ $? != 0 ]; then
- echo "[ERROR] rsync to production for $HOSTNAME failed!"
+ echo "[ERROR] rsync to production for ${HOSTNAME} failed!"
exit 1;
else
if [ $HAVE_NAIL = 1 ]; then
- echo $SUCCESS | nail -a $GRAPH -s "[WDO SUCCESS]: $HOSTNAME" $MAINTAINER_EMAIL
+ echo $SUCCESS | nail -a $GRAPH -s "[WDO SUCCESS]: ${HOSTNAME}" $MAINTAINER_EMAIL
else
- (echo $SUCCESS; uuencode $GRAPH $GRAPH) | mailx -s "[WDO SUCCESS]: $HOSTNAME" $MAINTAINER_EMAIL
+ (echo $SUCCESS; uuencode $GRAPH $GRAPH) | mailx -s "[WDO SUCCESS]: ${HOSTNAME}" $MAINTAINER_EMAIL
fi
fi
fi
=== modified file 'dbt2/weekly_dbt2_overview.sh'
--- a/dbt2/weekly_dbt2_overview.sh 2008-09-12 21:57:02 +0000
+++ b/dbt2/weekly_dbt2_overview.sh 2008-09-12 22:05:34 +0000
@@ -87,8 +87,8 @@ FALCON="$WORK/mysql-6.0-falcon"
#FALCON="$WORK/mysql-6.0-falcon-team"
#FALCON="$WORK/mysql-6.0-falcon-kevin"
-DBT2_RUNS="$BZR_BASE/weekly_dbt2_runs/$HOSTNAME"
-OLD_DBT2_RUNS="$BZR_BASE/old_weekly_dbt2_runs/$HOSTNAME"
+DBT2_RUNS="$BZR_BASE/weekly_dbt2_runs/${HOSTNAME}"
+OLD_DBT2_RUNS="$BZR_BASE/old_weekly_dbt2_runs/${HOSTNAME}"
DBT2_ERROR_LOGS="$DBT2_RUNS/w$WAREHOUSES/err"
DBT2_IO_STATS="$DBT2_RUNS/w$WAREHOUSES/io_stats"
@@ -202,7 +202,7 @@ RM_DIR="rm -rf \
falcon_* \
ibdata* \
ib_logfile* \
- $HOSTNAME.* \
+ ${HOSTNAME}.* \
test* \
$LOG_DIR/falcon_* \
$LOG_DIR/ib_logfile* \
@@ -232,7 +232,7 @@ start_mysqld()
k=$(($k + 1))
if [ $k -eq 120 ]; then
echo "[ERROR] Could not start mysqld" >> $LOG
- echo "[ERROR] Could not start mysqld on $HOSTNAME" | ${MAIL} -s"WDO: error starting mysqld on $HOSTNAME" $ADMIN
+ echo "[ERROR] Could not start mysqld on ${HOSTNAME}" | ${MAIL} -s"WDO: error starting mysqld on ${HOSTNAME}" $ADMIN
exit 1;
fi
$MYSQLADMIN -uroot ping
@@ -473,7 +473,7 @@ for ENGINE in FALCON INNODB
rm -rf output/$ROUND
# Copy error log of mysqld.
- cp $DATA_DIR/$HOSTNAME.err $DBT2_ERROR_LOGS/"$ENGINE"_"$CONTROL_TIMESTAMP"_"$i"_"$ROUND".err
+ cp $DATA_DIR/${HOSTNAME}.err $DBT2_ERROR_LOGS/"$ENGINE"_"$CONTROL_TIMESTAMP"_"$i"_"$ROUND".err
chmod -R 755 $DBT2_ERROR_LOGS
ROUND=$(($ROUND + 1))
| Thread |
|---|
| • bzr commit into mysql-falcon branch (hky:264) | Hakan Kuecuekyilmaz | 13 Sep |
