Merge branch 'bkemain' into 'oramain'

Bkemain to Oramain

See merge request rwp/rwloadsim!25

Author: bengsig

CHANGELOG.md

@@ -7,6 +7,7 @@
 * OLTP workload gets ociping and connect times
 * Bitwise operations and input of hexadecimal constants
 * Bit set/clear assignments
+* session pool can set max usage count and max lifetime
 * dbsecounds() and ociseconds() functions
 
 ## 3.1.3

docs/ERRORLIST.md

@@ -1338,6 +1338,10 @@ allowed.
 The right operand of the bitwise shift operation is larger than or equal to
 the bit width of the left operand. The right operand should be at most 63.
 
+### RWL-328 error: "the connection pool database '%s' cannot use release %s"
+The release count or every time can only be provided for session pools, you can
+use release time (without the count or every keyword) as an alternative.
+
 ### RWL-600 internal error: '%s'
 An abnormal situation caused an internal error in rwloadsim.
 This is in most cases due to a programming error and it

docs/refman/connping.html

@@ -6,7 +6,7 @@ databasedeclaration \- RWP*Load Simulator declare a database connection
 \fC
 databasedeclaration ::=
   \fBdatabase\fR identifier [ concatenation ]
-  databasespecification { databasespecification }
+  { databasespecification }
 
 databasespecification ::=
   \fBusername\fR concatenation
@@ -18,14 +18,25 @@ databasespecification ::=
 | \fBreconnect\fR
 | [ \fBthreads\fR ] \fBdedicated\fR [ \fBrequestmark\fR | \fBstatemark\fR ] 
 | \fBcursorcache\fR expression
-| \fBsessionpool\fR expression [ \fB..\fR expression ] [ releasepool ] [ waitsession ]
+| \fBsessionpool\fR expression [ \fB..\fR expression ] { sessionrelease } ] [ waitsession ]
 | \fBconnectionclass\fR concatenation
-| \fBconnectionpool\fR expression [ \fB..\fR expression ] [ releasepool ]
+| \fBconnectionpool\fR expression [ \fB..\fR expression ] [ idlerelease ]
 | \fBconnect\fR \fBconnectionpool\fR identifier
 
-releasepool ::=
+sessionrelease ::=
+  idlerelease 
+  | countrelease
+  | lifetimerelease
+
+idlerelease ::=
   \fBrelease\fR expression
 
+lifetimerelease ::=
+  \fBrelease\fR \fBevery\fR expression
+
+countrelease ::=
+  \fBrelease\fR \fBcount\fR expression
+
 waitsession ::=
   \fBwait\fR expression
   | \fBwait\fR expression \fBthen break\fR
@@ -121,7 +132,7 @@ Note that this can imply a high number of database connections and dis-connectio
 .RE
 .P
 \fBdedicated\fR 
-.P
+.br
 \fBthreads dedicated\fR 
 .RS 4
 Use dedicated connections that are established once and kept logged on during 
@@ -169,13 +180,25 @@ does not have the counterpart of an OCIConnectionPool.
 .RE
 .P
 .B \fBrelease\fR value
+.br
+.B \fBrelease count\fR value
+.br
+.B \fBrelease every\fR value
 .RS 4
-For a pool, set the timeout value for idle
+For a pool, the first option sets the timeout value for idle
 sessions (OCI_ATTR_SPOOL_TIMEOUT)
 or connections (OCI_ATTR_CONN_TIMEOUT);
 the default is 60s.
 Sessions or connections in the pool that have been idle for more than the release value
 will disconnect unless the pool already has its minimum size.
+.P
+For a session pool, you can also set the max usage count (OCI_ATTR_SPOOL_MAX_USE_SESSION)
+or the max lifetime (OCI_ATTR_SPOOL_MAX_LIFETIME_SESSION)
+using the either of the two last options.
+The default is 0 implying sessions will not have a max usage count or max lifetime.
+.P
+For all three attributes, you may provide a double value, but since the value used in OCI
+is an integer, only the integer part of the value will be used.
 .RE
 .P
 .B \fBwait\fR value

docs/refman/databasedeclaration.html

@@ -387,6 +387,11 @@ rwl_daily_html := "daily.html";
 # You can modify the aggresiveness of logons by changing the time
 # OCI waits until it disconnects an unused session in the pool
 # rwl_pool_release := 5.0; # default is 5.0
+# The next two will set OCI_ATTR_SPOOL_MAX_USE_SESSION or 
+# OCI_ATTR_SPOOL_MAX_LIFETIME_SESSION. Default are not set (null)
+# implying there will be no max use or lifetime
+# rwl_pool_max_use;
+# rwl_pool_max_lifetime;
 
 # By default, an instance level awr report is gathered for all
 # instances that are open. If you also want to create a global

docs/refman/ociping.html

@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
+# bengsig  10-oct-2023 - sessionpool max use/lifetime
 # bengsig  31-jul-2023 - rategradientstep
 # bengsig  17-jun-2023 - add mtit_partitions parameter
 # bengsig  23-may-2024 - Fix s24 full scan message
@@ -67,6 +68,8 @@ double rampfactor := 0.1;
 integer rwl_min_pool := 3;
 integer rwl_max_pool := 10;
 double rwl_pool_release := 5.0;
+integer rwl_pool_max_use;
+integer rwl_pool_max_lifetime;
 double max_sessionwait := 30; # how long to wait max to get a session
 
 # Reduce if you want more parsing, increase if you want less
@@ -631,6 +634,8 @@ if show_changed_values then
     end if;
     printline "rwl_max_pool="||rwl_max_pool;
     printline "rwl_pool_release="||rwl_pool_release;
+    printf "rwl_pool_max_use=%Nd\n", rwl_pool_max_use;
+    printf "rwl_pool_max_lifetime=%Nd\n", rwl_pool_max_lifetime;
   else
     if pool_type = "drcp" then
       printline "normal pool uses drcp";

docs/refman/utilities.html

@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
+# bengsig  10-oct-2024 - rwl_pool_max_use/lifetime
 # bengsig  11-sep-2023 - max_sessionwait
 # bengsig  21-mar-2023 - connection pool
 # bengsig  25-oct-2022 - External control
@@ -57,6 +58,8 @@ $if $RWLOLTP_SIDE = "2" $then
     $if pool_type = "sessionpool" $then
       sessionpool rwl_min_pool .. rwl_max_pool
       release rwl_pool_release
+      $if rwl_pool_max_use is not null $then release count rwl_pool_max_use $endif
+      $if rwl_pool_max_lifetime is not null $then release every rwl_pool_max_lifetime $endif
       $if xc_enabled $then
          wait xc_sessionwait then call_failure("No session available due to ORA-" oraerror)
       $else
@@ -138,6 +141,8 @@ $else
     $if pool_type = "sessionpool" $then
       sessionpool rwl_min_pool .. rwl_max_pool
       release rwl_pool_release
+      $if rwl_pool_max_use is not null $then release count rwl_pool_max_use $endif
+      $if rwl_pool_max_lifetime is not null $then release every rwl_pool_max_lifetime $endif
       $if xc_enabled $then
          wait xc_sessionwait then call_failure("No session available due to ORA-" oraerror)
       $else