From b4f854a96a41e2f13e4b7334ff4c8ae7c738b739 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Wed, 17 Aug 2022 18:59:36 -0700
Subject: [PATCH 1/2] Issue 45345: Optimize default DB connection pool config

---
 webapps/labkey.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapps/labkey.xml b/webapps/labkey.xml
index 34729f0906..40d16d0b90 100644
--- a/webapps/labkey.xml
+++ b/webapps/labkey.xml
@@ -8,10 +8,15 @@
         driverClassName="@@jdbcDriverClassName@@"
         url="@@jdbcURL@@"
         maxTotal="20"
-        maxIdle="10"
+        initialSize="3"
+        maxIdle="3"
+        minIdle="1"
         maxWaitMillis="120000"
+        testOnBorrow="false"
+        testWhileIdle="true"
+        timeBetweenEvictionRunsMillis="300000"
+        minEvictableIdleTimeMillis="300000"
         accessToUnderlyingConnectionAllowed="true"
-        validationQuery="SELECT 1"
         />
 
     <Resource name="mail/Session" auth="Container"

From 1c98dfd71774f427798421bbf2563805503ba625 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Thu, 18 Aug 2022 09:36:28 -0700
Subject: [PATCH 2/2] Remove initialSize property which breaks bootstrapping
 the DB

---
 webapps/labkey.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapps/labkey.xml b/webapps/labkey.xml
index 40d16d0b90..0e0bd74fb8 100644
--- a/webapps/labkey.xml
+++ b/webapps/labkey.xml
@@ -8,7 +8,6 @@
         driverClassName="@@jdbcDriverClassName@@"
         url="@@jdbcURL@@"
         maxTotal="20"
-        initialSize="3"
         maxIdle="3"
         minIdle="1"
         maxWaitMillis="120000"