Skip to content

Commit 1f6e0b3

Browse files
author
gitlab
committed
Merge branch 'ZSTAC-83499' into '5.5.12'
<fix>[conf]: MySQL timeout is not defined See merge request zstackio/zstack!9491
2 parents 47efb85 + fa71055 commit 1f6e0b3

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

conf/springConfigXml/DatabaseFacade.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<property name="testConnectionOnCheckout" value="${DbFacadeDataSource.testConnectionOnCheckout:true}"/>
5353
<property name="connectionTesterClassName" value="${DbFacadeDataSource.connectionTesterClassName:org.zstack.core.db.C3p0ConnectionTester}"/>
5454
<property name="maxIdleTime" value="${ExtraDataSource.maxIdleTime:3600}"/>
55+
<property name="checkoutTimeout" value="${ExtraDataSource.checkoutTimeout:5000}"/>
5556
</bean>
5657

5758
<bean id="entityManagerFactory"
@@ -87,7 +88,7 @@
8788
<!--.8.2.x infinispan not support async https://issues.redhat.com/browse/ISPN-4065 -->
8889
<prop key="hibernate.search.default.worker.execution">sync</prop>
8990
<!--<prop key="hibernate.search.default.index_flush_interval">${IndexWorker.flushInterval:1000}</prop>-->
90-
<prop key="hibernate.globally_quoted_identifiers">true</prop>
91+
<prop key="hibernate.globally_quoted_identifiers">true</prop>
9192
<prop key="hibernate.default_batch_fetch_size">50</prop>
9293
</props>
9394
</property>

0 commit comments

Comments
 (0)