No ash if no awr

Author: bengsig

bin/oltpcore

@@ -11,6 +11,7 @@
 
 # Changes
 #
+# bengsig  29-sep-2023 - No ash if no awr
 # bengsig   7-aug-2023 - Also mute59 in graphs
 # bengsig   1-aug-2023 - Add oltpxcset markers from oltpxcrun
 # bengsig   9-may-2023 - --oltp-xc option to turn on external control
@@ -358,7 +359,7 @@ if test $oltpxc = no || oltpxcset | grep -q stopnow=0
 then
 
   # copy the ash data from systemdb to results db
-  rwloadsim -u -A 2 -q ashstep2.rwl $runnumber $runperiod &
+  test $doawr -ne 0 && rwloadsim -u -A 2 -q ashstep2.rwl $runnumber $runperiod &
 
   # copy the ping.csv file to resultsdb
   rwloadsim -u -A 1 -q pingcsv2res.rwl $runnumber &
@@ -386,7 +387,7 @@ then
   test -x ./coreextra-$RWLOLTP_NAME.sh && ./coreextra-$RWLOLTP_NAME.sh $runnumber
 else
   # copy the ash data from systemdb to results db
-  rwloadsim -u -A 2 -q ashstep2.rwl $runnumber $runperiod &
+  test $doawr -ne 0 && rwloadsim -u -A 2 -q ashstep2.rwl $runnumber $runperiod &
   # and make the awr reports
   test $doawr -ne 0 && rwloadsim -u -A 1 -q makeawr.rwl $runnumber &
   # and the the truncate

oltp/runsys.rwl

@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
+# bengsig  29-sep-2023 - no ashstep if no doawr
 # bengsig  26-apr-2023 - Make sure ashstep1 is performed
 # bengsig  25-oct-2022 - External control
 # bengsig  15-sep-2022 - Use new file open syntax
@@ -232,7 +233,7 @@ $if !xc_enabled $then
 $endif
 
   # Create the SQL that will collact top ash data
-  threads 1 
+  threads doawr != 0
     for wait 1 stop runperiod loop
       null;
       $if xc_enabled $then if xc_stopnow=1 or xc_stopnow=2 then break; end if; $endif