From: <ma...@us...> - 2006-10-26 17:29:25
|
Revision: 1569 http://svn.sourceforge.net/osdldbt/?rev=1569&view=rev Author: markwkm Date: 2006-10-26 10:29:13 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Fixed the scripts so that it doesn't start multiple oprofile commands when run in a single-tier environment. Modified Paths: -------------- trunk/dbt2/scripts/run_workload.sh.in Modified: trunk/dbt2/scripts/run_workload.sh.in =================================================================== --- trunk/dbt2/scripts/run_workload.sh.in 2006-10-26 17:28:14 UTC (rev 1568) +++ trunk/dbt2/scripts/run_workload.sh.in 2006-10-26 17:29:13 UTC (rev 1569) @@ -314,7 +314,7 @@ # Create the directories we will need. # make_directories -if [ -n ${DB_HOSTNAME} ]; then +if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then # # Create direcotires on the database server if specified. # @@ -350,7 +350,7 @@ echo "Test Duration: $DURATION seconds" >> $OUTPUT_DIR/readme.txt echo "Database Connections: $DBCON" >> $OUTPUT_DIR/readme.txt -if [ -n ${DB_HOSTNAME} ]; then +if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then DB_COMMAND="ssh ${DB_HOSTNAME}" fi @@ -447,7 +447,7 @@ # Initialize oprofile before we start the driver. if [ ${USE_OPROFILE} -eq 1 ]; then oprofile_init - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then oprofile_init ${DB_HOSTNAME} fi fi @@ -468,7 +468,7 @@ # Clear the readprofile data after the driver ramps up. if [ -f /proc/profile ]; then readprofile_clear() - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then readprofile_clear ${DB_HOSTNAME} fi fi @@ -476,7 +476,7 @@ # Reset the oprofile counters after the driver ramps up. if [ ${USE_OPROFILE} -eq 1 ]; then oprofile_reset - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then oprofile_reset ${DB_HOSTNAME} fi fi @@ -488,7 +488,7 @@ # Collect readprofile data. if [ -f /proc/profile ]; then readprofile_collect ${OUTPUT_DIR} - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then readprofile_collect ${DB_OUTPUT_DIR} ${DB_HOSTNAME} fi fi @@ -496,7 +496,7 @@ # Collect oprofile data. if [ ${USE_OPROFILE} -eq 1 ]; then oprofile_collect ${OUTPUT_DIR} - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then oprofile_collect ${DB_OUTPUT_DIR} ${DB_HOSTNAME} fi fi @@ -519,7 +519,7 @@ if [ ${USE_OPROFILE} -eq 1 ]; then oprofile_annotate ${OUTPUT_DIR} & - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then oprofile_annotate ${DB_OUTPUT_DIR} ${DB_HOSTNAME} & fi fi @@ -527,12 +527,12 @@ if [ ${USE_OPROFILE} -eq 1 ]; then oprofile_stop - if [ -n ${DB_HOSTNAME} ]; then + if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then oprofile_stop ${DB_HOSTNAME} fi fi -if [ -n ${DB_HOSTNAME} ]; then +if [ -n ${DB_HOSTNAME} -a ! "${DB_HOSTNAME}" == "localhost" ]; then # # If a database system is specified, rsync all the logs back to here. # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |