some cleaup, provide an init or not, or default, some comments on config file.

Author: Michel Pelletier

nancy_run.sh

@@ -1233,7 +1233,7 @@ function restore_dump() {
       docker_exec bash -c "pg_restore -j $CPU_CNT --no-owner --no-privileges -U postgres -d $DB_NAME $MACHINE_HOME/$DB_DUMP_FILENAME" || true
       ;;
     pgbnch)
-      docker_exec bash -c "source $MACHINE_HOME/$DB_DUMP_FILENAME; pgbench -U postgres -i -s \$PGBENCH_SCALE $DB_NAME" || true
+      docker_exec bash -c "source $MACHINE_HOME/$DB_DUMP_FILENAME; pgbench \$INIT -U postgres -s \$SCALE $DB_NAME" || true
       ;;
   esac
   END_TIME=$(date +%s);
@@ -1410,7 +1410,10 @@ function execute_workload() {
     fi
   elif [ "$DB_DUMP_EXT" = "pgbnch" ]; then
       msg "Running pgbench..."
-      docker_exec bash -c "source $MACHINE_HOME/$DB_DUMP_FILENAME; pgbench -c \$PGBENCH_CLIENTS -j \$PGBENCH_JOBS -t \$PGBENCH_TRANSACTIONS -U postgres $DB_NAME"
+      docker_exec bash -c <<EOF "
+source $MACHINE_HOME/$DB_DUMP_FILENAME;
+pgbench -P \$PROGRESS -c \$CLIENTS -j \$JOBS -t \$TRANSACTIONS -U postgres $DB_NAME"
+EOF
   else
     if ([ ! -z ${WORKLOAD_CUSTOM_SQL+x} ] && [ "$WORKLOAD_CUSTOM_SQL" != "" ]); then
       WORKLOAD_CUSTOM_FILENAME=$(basename $WORKLOAD_CUSTOM_SQL)

test.pgbnch

@@ -1,4 +1,9 @@
-export PGBENCH_SCALE="3"
-export PGBENCH_CLIENTS="1"
-export PGBENCH_JOBS="1"
-export PGBENCH_TRANSACTIONS="100"
+# common options for running pgbench under nancy:
+
+export INIT="-i"            # init to use with pgbench, -i creates standard tables
+export SCALE="50"           # "scaling factor" to use when populating tables
+export CLIENTS="5"          # number of client sessions to run
+export JOBS="2"             # number of concurrent sessions.
+export TRANSACTIONS="10000" # number of "transactions" (see pgbench docs)
+export PROGRESS="1"         # progress report interval
+