diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2018-05-07 20:26:19 -0500 |
|---|---|---|
| committer | Jorge Hernandez <jh1730@att.com> | 2018-05-07 20:26:19 -0500 |
| commit | f74bbc97aefb9c7e550b8e123581f1e4fa78f84d (patch) | |
| tree | d48f9f012833048638e91126c3dde9263d4d6509 /ONAP-PAP-REST | |
| parent | 973929cfd6cd3e5ba3a837fa56d35b210307c9ac (diff) | |
fix PE DB lock timeout problems
see companion docker review.
The failOverReadOnly .. flags should only be used when a DB high
availability environment is used, such as a master/slave
configuration.
As they are the jdbc parameters have caused bad interactions
with the underlying persistence libraries rendering the PAP
useless.
It is thought that this may perhaps solve
POLICY-773, POLICY-775, POLICY-779, and perhaps POLICY-776.
Change-Id: Icb69a3afc0a19969a34af40d960fa8e1b94aabc0
Issue-ID: POLICY-777
Signed-off-by: Jorge Hernandez <jh1730@att.com>
Diffstat (limited to 'ONAP-PAP-REST')
| -rw-r--r-- | ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java | 2 | ||||
| -rw-r--r-- | ONAP-PAP-REST/xacml.pap.properties | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java index 35540b3a2..b57c187c7 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java @@ -45,7 +45,7 @@ public class PAPRestConfigTest { @Test public void testInit() { String driver = "org.mariadb.jdbc.Driver"; - String url = "jdbc:mariadb://localhost:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true"; + String url = "jdbc:mariadb://localhost:3306/onap_sdk?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30"; String user = "policy_user"; String password = "policy_user"; diff --git a/ONAP-PAP-REST/xacml.pap.properties b/ONAP-PAP-REST/xacml.pap.properties index dc8300d92..bd0fed40c 100644 --- a/ONAP-PAP-REST/xacml.pap.properties +++ b/ONAP-PAP-REST/xacml.pap.properties @@ -89,7 +89,7 @@ xacml.rest.pdp.idfile=test.properties #Properties for db access #properties for MySql xacml database: PLEASE DO NOT REMOVE... NEEDED FOR APIs javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver -javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true +javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/onap_sdk?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30 javax.persistence.jdbc.user=policy_user javax.persistence.jdbc.password=policy_user @@ -158,4 +158,4 @@ CLIENT_KEY= #Micro Service Model Properties xacml.policy.msOnapName=http://org.onap -xacml.policy.msPolicyName=http://org.onap.policy
\ No newline at end of file +xacml.policy.msPolicyName=http://org.onap.policy |