From 5d979d0b269a062fdb2a097178b9faf9eceb4502 Mon Sep 17 00:00:00 2001
From: Ben Parees <bparees@redhat.com>
Date: Fri, 10 Jan 2014 16:16:21 -0500
Subject: [PATCH] Bug 1051349 - sql db cannot be connected via java datasource
 after db cartridge restart on the first time

---
 .../7/standalone/configuration/standalone.xml | 20 +++++++++++--------
 .../standalone/configuration/standalone.xml   | 20 +++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/cartridges/openshift-origin-cartridge-jbossas/versions/7/standalone/configuration/standalone.xml b/cartridges/openshift-origin-cartridge-jbossas/versions/7/standalone/configuration/standalone.xml
index 3ef42c162e2..60f9ccc2262 100755
--- a/cartridges/openshift-origin-cartridge-jbossas/versions/7/standalone/configuration/standalone.xml
+++ b/cartridges/openshift-origin-cartridge-jbossas/versions/7/standalone/configuration/standalone.xml
@@ -108,10 +108,12 @@
                       <password>${env.OPENSHIFT_MYSQL_DB_PASSWORD}</password>
                     </security>
                     <validation>
-                    	<check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
-                    	<background-validation>true</background-validation>
-                	</validation>
-                	<pool>
+                        <check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+                        <background-validation>true</background-validation>
+                        <background-validation-millis>60000</background-validation-millis>
+                        <!--<validate-on-match>true</validate-on-match>-->
+                    </validation>
+                    <pool>
 						<flush-strategy>IdleConnections</flush-strategy>
 					</pool>
                 </datasource>
@@ -123,10 +125,12 @@
                       <password>${env.OPENSHIFT_POSTGRESQL_DB_PASSWORD}</password>
                     </security>
                     <validation>
-                    	<check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
-                    	<background-validation>true</background-validation>
-                	</validation>
-                	<pool>
+                        <check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+                        <background-validation>true</background-validation>
+                        <background-validation-millis>60000</background-validation-millis>
+                        <!--<validate-on-match>true</validate-on-match>-->
+                    </validation>
+                    <pool>
 						<flush-strategy>IdleConnections</flush-strategy>
 					</pool>
                 </datasource>
diff --git a/cartridges/openshift-origin-cartridge-jbosseap/versions/shared/standalone/configuration/standalone.xml b/cartridges/openshift-origin-cartridge-jbosseap/versions/shared/standalone/configuration/standalone.xml
index 1a7c96f7a53..dd0badf1f4b 100755
--- a/cartridges/openshift-origin-cartridge-jbosseap/versions/shared/standalone/configuration/standalone.xml
+++ b/cartridges/openshift-origin-cartridge-jbosseap/versions/shared/standalone/configuration/standalone.xml
@@ -110,10 +110,12 @@
 						<password>${env.OPENSHIFT_MYSQL_DB_PASSWORD}</password>
 					</security>
 					<validation>
-                    	<check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
-                    	<background-validation>true</background-validation>
-                	</validation>
-                	<pool>
+						<check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+						<background-validation>true</background-validation>
+						<background-validation-millis>60000</background-validation-millis>
+						<!--<validate-on-match>true</validate-on-match>-->
+					</validation>
+					<pool>
 						<flush-strategy>IdleConnections</flush-strategy>
 						<allow-multiple-users/>
 					</pool>
@@ -129,10 +131,12 @@
 						<password>${env.OPENSHIFT_POSTGRESQL_DB_PASSWORD}</password>
 					</security>
 					<validation>
-                    	<check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
-                    	<background-validation>true</background-validation>
-                	</validation>
-                	<pool>
+						<check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+						<background-validation>true</background-validation>
+						<background-validation-millis>60000</background-validation-millis>
+						<!--<validate-on-match>true</validate-on-match>-->
+					</validation>
+					<pool>
 						<flush-strategy>IdleConnections</flush-strategy>
 						<allow-multiple-users/>
 					</pool>