Implement rategradient for gradual rate increase

Author: bengsig

bin/oltpcore

@@ -11,6 +11,7 @@
 
 # Changes
 #
+# bengsig  15-nov-2022 - rategradient, -i, -d options
 # bengsig   1-nov-2022 - --no-awr option
 # bengsig  25-oct-2022 - External control
 # bengsig   9-sep-2022 - Better aw query control
@@ -20,7 +21,7 @@
 # show how we were called
 tty -s || echo $0 $*
 
-options="bo:gn:k:r:hHp:s:a2x:R:WK: -l xc_run_dedicated,simulatebatch,help,extraout:,runfile:,runnumberfile:,startseconds:,processcount:,key:,runperiod:,preallocate,awrwait,awrkill:,graphs,no-awr"
+options="i:d:bo:gn:k:r:hHp:s:a2x:R:WK: -l integer:,double:,xc_run_dedicated,simulatebatch,help,extraout:,runfile:,runnumberfile:,startseconds:,processcount:,key:,runperiod:,preallocate,awrwait,awrkill:,graphs,no-awr"
 usage="$commandname [-h|H] [-g] [-a] [-W] [-K n] [-n processes] [-k key] [-r runperiod] [-R runfile] [-p file] [-s file] [-o file] komment text ..."
 runperiod=295
 
@@ -40,6 +41,8 @@ allocate=no
 simulatebatch=0
 xc_run_dedicated='0'
 killfile=''
+extra_args=''
+
 unset RWLOLTP_SIDE
 
 getopt -Q -o $options -- "$@" || exit 1
@@ -48,6 +51,8 @@ set -- `getopt -u -n $commandname -o $options -- "$@"`
 while test $1 != '--'
 do
   case $1 in 
+    -i|--integer|-d|--double) extra_args="$extra_args $1 $2"; shift; shift;
+        ;;
     -o|--extraout) extraout=$2; shift; shift;
         ;;
     -s|--startseconds) startsecondsfile=$2; shift; shift;
@@ -134,14 +139,12 @@ then
   exit 1
 fi
 
-extra_args=''
-
 
 rwloadsim -i simulatebatch:=$simulatebatch parameters.rwl || exit $?
 
 #                      
 # show the contents of our parameters file as a reference
-rwloadsim -q -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -i show_changed_values:=1 parameters.rwl
+rwloadsim -q $extra_args -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -i show_changed_values:=1 parameters.rwl
 
 # Set shell variables
 eval `rwloadsim -q -i proccount:=$procs -i runperiod:=$runperiod parameters2shell.rwl`
@@ -200,7 +203,7 @@ then
 else
   echo "plotactive=no" >> $resultsdir/$subdir/$runnumber/env
 fi
-rwloadsim -q -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -i show_changed_values:=1 parameters.rwl > $resultsdir/$subdir/$runnumber/parmatstart.txt
+rwloadsim -q $extra_args -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -i show_changed_values:=1 parameters.rwl > $resultsdir/$subdir/$runnumber/parmatstart.txt
 
 # Start ping gather and also ask for event notification 
 rwloadsim -u -E -q -R $prepfile -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod runping.rwl &
@@ -213,7 +216,7 @@ fi
 quiet=''
 
 # Start sys gather
-rwloadsim -u -A 1 -r -q -i procnumber:=99999 -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -R $prepfile $extra_args -i doawr:=$doawr runsys.rwl $starttime &
+rwloadsim -u -A 1 -r -q -i procnumber:=99999 -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -R $prepfile -i doawr:=$doawr runsys.rwl $starttime &
 awrpid=$!
 
 if test x$killfile != x

bin/oltprun

@@ -7,14 +7,15 @@
 
 # Changes
 #
+# bengsig  15-nov-2022 - rategradient, -i, -d options
 # bengsig   2-jul-2022 - Add simulatebatch
 # bengsig  26-jan-2022 - Use mktemp rather than $$ for intermediate files
 # bengsig  14-jan-2021 - Copy out file to awrdir .txt file after extra scripts
 
 # This is mostly a wrapper for runcore.sh that
 # saves stdout and stderr in a file
 
-options="bx:n:gk:r:hHa2R:WK:o: -l simulatebatch,help,extraout:,runfile:,startseconds:,processcount:,key:,runperiod:,preallocate,awrwait,awrkill:,graphs,extrascript:"
+options="i:d:bx:n:gk:r:hHa2R:WK:o: -l integer:,double:,simulatebatch,help,extraout:,runfile:,startseconds:,processcount:,key:,runperiod:,preallocate,awrwait,awrkill:,graphs,extrascript:"
 usage="$commandname [-H] [-g] [-a] [-2] [-k key] [-r runperiod] [-R file] [-n procs] [-x script] [-o file] [-W] [-K nn] [komment text ...]"
 runperiod=295
 
@@ -44,7 +45,7 @@ do
         ;;
     --simulatebatch|-b|--graphs|--awrwait|--preallocate|-W|-a|-g|-2) copyargs="$copyargs $1"; shift;
         ;;
-    --runfile|--awrkill|-R|-K) copyargs="$copyargs $1 $2"; shift; shift;
+    -i|-d|--integer|--double|--runfile|--awrkill|-R|-K) copyargs="$copyargs $1 $2"; shift; shift;
         ;;
     -h|--help|-H ) help=yes; shift;
         ;;

docs/refman/oltpcore.html

@@ -91,6 +91,12 @@ Add the contents of the named text file to generated html output; this can be us
 to add more information than feasible using komment.
 .RE
 .P
+.B -i|--integer|-d|--double spec
+.RS 4
+Provide the option to rwloadsim when doing the actual run, i.e. when run.rwl (or the file
+given as the -R option) is executed.
+.RE
+.P
 .B -W|--awrwait
 .P
 .B -K|--awrkill n

docs/refman/oltprun.html

@@ -91,6 +91,12 @@ Execute the named script (which must be in your current directory) after complet
 it will be provided one argument which is the runnumber.
 .RE
 .P
+.B -i|--integer|-d|--double spec
+.RS 4
+Provide the option to rwloadsim when doing the actual run, i.e. when run.rwl (or the file
+given as the -R option) is executed.
+.RE
+.P
 .B -W|--awrwait
 .P
 .B -K|--awrkill n

docs/refman/oltpsetup.html

@@ -315,6 +315,20 @@ You can very approximately assume that with the default value together with the
 \fBthreadcount\fR, making runs with one process will require in the order of 0.2 database CPU seconds per second.
 .RE
 .P
+\fBrategradient\fR
+.RS 4
+This is a double value that can be used to make the overall workload increase gradually during
+a run.
+If the value is 0 (or is unset), the arrival rate will be constant during the run;
+this is the default behavior.
+If the value is set higher than 0 and at most to 1, the arrival rate will initially be
+\fIlower\fR than specified via \fBratefactor\fR, half way through the run it will be
+what \fBratefactor\fR specifies and at the finish of the run, it will be \fIhigher\fR.
+Effectively, the rate will gradually increase from 100*rategradient percent below normal
+to 100*rategradient percent above normal.
+Values outside the range [0;1] will be adjusted to either 0 or 1.
+.RE
+.P
 \fBthreadcount\fR
 .RS 4
 This is an integer value (default 50) that sets the number of worker threads per process.

man/man2rwl/oltpcore.2rwl

@@ -254,6 +254,16 @@ gnuplotjs := "/usr/share/gnuplot/4.6/js";
 # the workload. Initially, leave it at the default.
 # ratefactor := 0.2;    # proportionally changes load (default 0.2)
 
+# Rather than a constant workload, you can make it gradually increase
+# during the run by setting rategradient.
+# If set to NULL or 0, same rate through whole run; this is the default
+# Otherwise the workload will start 100*rategradient % lower
+# and finish 100*rategradient % higher.
+# The value must be in the range [0.0;1.0]
+# As an example, if you uncomment this following line
+# rategradient := 0.25;
+# the rate will gradually increase from 75% to 125%.
+
 # If using the oltpforever command to run continously, this parameter
 # sets the number of processes in oltpforever (and oltpforever2)
 # forever_proccount := 1;      # process count per side in continuous tests 

man/man2rwl/oltprun.2rwl

@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
+# bengsig  15-nov-2022 - Add rategradient
 # bengsig  25-oct-2022 - External control
 # bengsig         2019 - Creation
 
@@ -19,6 +20,10 @@ $errortime:on
 # per process on a 2GHz CPU.  Higher values means proportionally higher load
 double ratefactor := 0.2;
 
+double rategradient;
+# NULL or 0, same rate through whole run
+# otherwise multiply ratefactor by 1+gradient*(runseconds-runperiod/2)/(runperiod/2)
+
 # How many seconds rampump between worker threads
 double rampfactor := 0.1;
 
@@ -248,6 +253,18 @@ double xc_sessionwait := 120; # seconds timeout waitit for a free session, 0 for
 
 $include:"$RWLOLTP_NAME.rwl"
 
+# gradient stuff
+double halfperiod := runperiod / 2.0;
+if rategradient is not null then
+  if rategradient < 0.0 then
+    rategradient := 0.0;
+  end if;
+  if rategradient > 1.0 then
+    rategradient := 1.0;
+  end if;
+end if;
+  
+
 if sysawr_connect = "" then
   sysawr_connect := system_connect;
 end if;
@@ -311,7 +328,14 @@ if show_changed_values then
   if simulatebatch then
     printline "ratefactor is not used in busy loop";
   else
-    printline "ratefactor="||ratefactor " (" xeqpsec " tps outside bursts)";
+    if rategradient is not null then
+      double xeqpslo := threadcount * proccount * ratefactor * (1.0-rategradient) / 0.08;
+      double xeqpshi := threadcount * proccount * ratefactor * (1.0+rategradient) / 0.08;
+      printf "ratefactor=%.2f (gradual increase from %.f to %.f tps outside bursts)\n"
+        , ratefactor, xeqpslo, xeqpshi;
+    else
+      printline "ratefactor="||ratefactor " (" xeqpsec " tps outside bursts)";
+    end if;
     printline "per worker: " ratefactor/0.08 "/s average arrival rate, " 0.08/ratefactor "s average time";
     printline "per process: " threadcount*ratefactor/0.08 "/s average arrival rate, "
 			  0.08/(ratefactor*threadcount) "s average time";