--- /dev/null
+# -----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building
+# Tomcat JDBC Pool for your local environment. It defines the location of all external
+# modules that Tomcat JDBC Pool depends on. Copy this file to "build.properties"
+# in the top-level source directory, and customize it as needed.
+# -----------------------------------------------------------------------------
+
+# ----- Vesion Control Flags -----
+version.major=1
+version.minor=1
+version.build=0
+version.patch=1
+version.suffix=
+
+# ----- Default Base Path for Dependent Packages -----
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=${basedir}/includes
+
+compile.source=1.7
+compile.target=1.7
+compile.debug=true
+
+# Do not pass -deprecation (-Xlint:deprecation) flag to javac
+compile.deprecation=false
+
+# ----- Settings for Junit test database.
+
+# Common settings
+testdb.username=root
+testdb.password=password
+
+# H2
+testdb.url=jdbc:h2:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=TRUE;LOCK_TIMEOUT=50000;DEFAULT_LOCK_TIMEOUT=50000
+testdb.driverClassName=org.h2.Driver
+testdb.validationQuery=SELECT 1
+
+# MySQL
+#testdb.url=jdbc:mysql://localhost:3306/mysql?autoReconnect=true
+#testdb.driverClassName=com.mysql.jdbc.Driver
+#testdb.validationQuery=SELECT 1
+
+# Derby
+#testdb.url=jdbc:derby:derbyDB;create=true
+#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+#testdb.validationQuery=VALUES 1
+
+# JUnit Unit Test Suite
+junit.version=4.11
+junit.home=${base.path}/junit-${junit.version}
+junit.jar=${junit.home}/junit-${junit.version}.jar
+junit.loc=http://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar
+
+# Hamcrest Library, used by JUnit
+hamcrest.version=1.3
+hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
+hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
+hamcrest.loc=http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+
+mysql.home=${base.path}/mysql-connector-java-5.1.12
+mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar
+mysql.loc=http://mysql.mirrors.hoobly.com/Downloads/Connector-J/mysql-connector-java-5.1.12.zip
+
+tomcat.version=8.0.14
+tomcat.home=${base.path}/apache-tomcat-${tomcat.version}
+tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
+tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
+tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
+
+tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
+tomcat.project.dest=${base.path}/project.xml
+
+tomcat.xsl.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
+tomcat.xsl.dest=${base.path}/tomcat-docs.xsl
+
+derby.home=${base.path}/db-derby-10.5.1.1-bin
+derby.loc=http://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz
+derby.jar=${derby.home}/lib/derby.jar
+
+h2.home=${base.path}/h2
+h2.loc=http://h2database.googlecode.com/files/h2-2010-02-19.zip
+h2.jar=${h2.home}/bin/h2-1.2.129.jar
package org.openecomp.sdnc.sli.resource.dblib;
+import java.io.Closeable;
+import java.io.IOException;
import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.sql.Blob;
import java.sql.Connection;
+import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Observer;
import javax.sql.rowset.CachedRowSet;
import javax.sql.rowset.RowSetProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.tomcat.jdbc.pool.PoolExhaustedException;
import org.openecomp.sdnc.sli.resource.dblib.config.BaseDBConfiguration;
import org.openecomp.sdnc.sli.resource.dblib.pm.SQLExecutionMonitor;
import org.openecomp.sdnc.sli.resource.dblib.pm.SQLExecutionMonitorObserver;
import org.openecomp.sdnc.sli.resource.dblib.pm.SQLExecutionMonitor.TestObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.mysql.jdbc.exceptions.jdbc4.MySQLNonTransientConnectionException;
/**
protected boolean initialized = false;
private long interval = 1000;
- private long initisalDelay = 5000;
+ private long initialDelay = 5000;
private long expectedCompletionTime = 50L;
private boolean canTakeOffLine = true;
private long unprocessedFailoverThreshold = 3L;
+ private long nextErrorReportTime = 0L;
+
+ private String globalHostName = null;
+
public CachedDataSource(BaseDBConfiguration jdbcElem) throws DBConfigException
{
return ds.getConnection();
}
- public CachedRowSet getData(String statement, ArrayList<String> arguments) throws SQLException, Throwable
+ public CachedRowSet getData(String statement, ArrayList<Object> arguments) throws SQLException, Throwable
{
TestObject testObject = null;
testObject = monitor.registerRequest();
}
if(LOGGER.isDebugEnabled())
LOGGER.debug("Obtained connection <" + connectionName + ">: "+connection.toString());
- return executePreparedStatement(connection, statement, arguments);
+ return executePreparedStatement(connection, statement, arguments, true);
} finally {
try {
if(connection != null && !connection.isClosed()) {
}
}
- public boolean writeData(String statement, ArrayList<String> arguments) throws SQLException, Throwable
+ public boolean writeData(String statement, ArrayList<Object> arguments) throws SQLException, Throwable
{
TestObject testObject = null;
testObject = monitor.registerRequest();
}
if(LOGGER.isDebugEnabled())
LOGGER.debug("Obtained connection <" + connectionName + ">: "+connection.toString());
- return executeUpdatePreparedStatement(connection, statement, arguments);
+ return executeUpdatePreparedStatement(connection, statement, arguments, true);
} finally {
try {
if(connection != null && !connection.isClosed()) {
}
}
- private CachedRowSet executePreparedStatement(Connection conn, String statement, ArrayList<String> arguments) throws SQLException, Throwable {
+ CachedRowSet executePreparedStatement(Connection conn, String statement, ArrayList<Object> arguments, boolean close) throws SQLException, Throwable
+ {
long time = System.currentTimeMillis();
CachedRowSet data = null;
}
try {
- if(conn != null){
+ if(conn != null && close){
conn.close();
conn = null;
}
return data;
}
- private boolean executeUpdatePreparedStatement(Connection conn, String statement, ArrayList<String> arguments) throws SQLException, Throwable {
+ boolean executeUpdatePreparedStatement(Connection conn, String statement, ArrayList<Object> arguments, boolean close) throws SQLException, Throwable {
long time = System.currentTimeMillis();
CachedRowSet data = null;
if(arguments != null)
{
for(int i = 0, max = arguments.size(); i < max; i++){
+ if(arguments.get(i) instanceof Blob) {
+ ps.setBlob(i+1, (Blob)arguments.get(i));
+ } else if(arguments.get(i) instanceof Timestamp) {
+ ps.setTimestamp(i+1, (Timestamp)arguments.get(i));
+ } else if(arguments.get(i) instanceof Integer) {
+ ps.setInt(i+1, (Integer)arguments.get(i));
+ } else if(arguments.get(i) instanceof Long) {
+ ps.setLong(i+1, (Long)arguments.get(i));
+ } else if(arguments.get(i) instanceof Date) {
+ ps.setDate(i+1, (Date)arguments.get(i));
+ } else {
ps.setObject(i+1, arguments.get(i));
}
}
+ }
rs = ps.executeUpdate();
// Point the rowset Cursor to the start
if(LOGGER.isDebugEnabled()){
}
throw exc; // new SQLException(exc);
} finally {
-
try {
- if(conn != null){
+ if(conn != null && close){
conn.close();
conn = null;
}
}
public void cleanUp(){
+ if(ds != null && ds instanceof Closeable) {
+ try {
+ ((Closeable)ds).close();
+ } catch (IOException e) {
+ LOGGER.warn(e.getMessage());
+ }
+ }
ds = null;
monitor.deleteObservers();
monitor.cleanup();
{
readOnly = rs.getBoolean(1);
hostname = rs.getString(2);
-// if(rs.getInt(1)==1){
+
if(LOGGER.isDebugEnabled()){
LOGGER.debug("SQL DataSource <"+getDbConnectionName() + "> connected to " + hostname + ", read-only is " + readOnly + ", tested successfully ");
}
-// }
}
} catch (Throwable exc) {
}
public long getInitialDelay() {
- return initisalDelay;
+ return initialDelay;
}
public void setInterval(long value) {
}
public void setInitialDelay(long value) {
- initisalDelay = value;
+ initialDelay = value;
}
public long getExpectedCompletionTime() {
return monitor;
}
- protected boolean isSlave() {
+ protected boolean isSlave() throws PoolExhaustedException, MySQLNonTransientConnectionException {
CachedRowSet rs = null;
boolean isSlave = true;
String hostname = "UNDETERMINED";
try {
-// rs = this.getData("show slave status", new ArrayList<String>());
-// while(rs.next()) {
-// String master = rs.getString(2);
-// LOGGER.debug("database <"+connectionName+"> defines master as " + master);
-// if(master == null || master.isEmpty() || master.equals(this.getDbConnectionName())) {
-// isSlave = false;
-// } else {
-// isSlave = true;
-// }
-// }
-
boolean localSlave = true;
- rs = this.getData("SELECT @@global.read_only, @@global.hostname", new ArrayList<String>());
+ rs = this.getData("SELECT @@global.read_only, @@global.hostname", new ArrayList<Object>());
while(rs.next()) {
localSlave = rs.getBoolean(1);
hostname = rs.getString(2);
}
isSlave = localSlave;
+ } catch(PoolExhaustedException | MySQLNonTransientConnectionException peexc){
+ throw peexc;
} catch (SQLException e) {
LOGGER.error("", e);
isSlave = true;
isSlave = true;
}
if(isSlave){
- LOGGER.debug("SQL SLAVE : "+connectionName + " on server " + hostname);
+ LOGGER.debug("SQL SLAVE : "+connectionName + " on server " + hostname);
} else {
- LOGGER.debug("SQL MASTER : "+connectionName + " on server " + hostname);
+ LOGGER.debug("SQL MASTER : "+connectionName + " on server " + hostname);
}
return isSlave;
}
-
+
public boolean isFabric() {
return false;
}
+
+ protected boolean lockTable(Connection conn, String tableName) {
+ boolean retValue = false;
+ Statement lock = null;
+ try {
+ if(tableName != null) {
+ if(LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Executing 'LOCK TABLES " + tableName + " WRITE' on connection " + conn.toString());
+ if("SVC_LOGIC".equals(tableName)) {
+ Exception e = new Exception();
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ e.printStackTrace(pw);
+ LOGGER.debug(sw.toString());
+ }
+ }
+ lock = conn.createStatement();
+ lock.execute("LOCK TABLES " + tableName + " WRITE");
+ retValue = true;
+ }
+ } catch(Exception exc){
+ LOGGER.error("", exc);
+ retValue = false;
+ } finally {
+ try {
+ lock.close();
+ } catch(Exception exc) {
+
+ }
+ }
+ return retValue;
+ }
+
+ protected boolean unlockTable(Connection conn) {
+ boolean retValue = false;
+ Statement lock = null;
+ try {
+ if(LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Executing 'UNLOCK TABLES' on connection " + conn.toString());
+ }
+ lock = conn.createStatement();
+ retValue = lock.execute("UNLOCK TABLES");
+ } catch(Exception exc){
+ LOGGER.error("", exc);
+ retValue = false;
+ } finally {
+ try {
+ lock.close();
+ } catch(Exception exc) {
+
+ }
+ }
+ return retValue;
+ }
+
+ public void getPoolInfo(boolean allocation) {
+
+ }
+
+ public long getNextErrorReportTime() {
+ return nextErrorReportTime;
+ }
+
+ public void setNextErrorReportTime(long nextTime) {
+ this.nextErrorReportTime = nextTime;
+ }
+
+ public void setGlobalHostName(String hostname) {
+ this.globalHostName = hostname;
+ }
+
+ public String getGlobalHostName() {
+ return globalHostName;
+ }
}
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
LOG.info("entering DBLIBResourceActivator.stop");
if (registration != null)
{
+ try {
+ ServiceReference sref = ctx.getServiceReference(DbLibService.class.getName());
+
+ if (sref == null) {
+ LOG.warn("Could not find service reference for DBLIB service (" + DbLibService.class.getName() + ")");
+ } else {
+ DBResourceManager dblibSvc = (DBResourceManager) ctx.getService(sref);
+ if (dblibSvc == null) {
+ LOG.warn("Could not find service reference for DBLIB service (" + DbLibService.class.getName() + ")");
+ } else {
+ dblibSvc.cleanUp();
+ }
+ }
+ } catch(Throwable exc) {
+ LOG.warn("Cleanup", exc);
+ }
+
registration.unregister();
registration = null;
LOG.debug("Deregistering DBResourceManager service");
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * openecomp
+ * ================================================================================
+ * Copyright (C) 2016 - 2017 AT&T
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.sli.resource.dblib;
+
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
+import javax.sql.rowset.CachedRowSet;
+
+import org.apache.tomcat.jdbc.pool.PooledConnection;
+import org.apache.tomcat.jdbc.pool.ProxyConnection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DBLibConnection implements Connection {
+
+ private static Logger LOGGER = LoggerFactory.getLogger(DBLibConnection.class);
+
+ private final Connection connection;
+ private final CachedDataSource dataSource;
+ private boolean locked = false;
+ private String tableName = null;
+
+ public DBLibConnection(Connection con, CachedDataSource dataSource){
+ this.connection = con;
+ this.dataSource = dataSource;
+ locked = false;
+ dataSource.getPoolInfo(true);
+ }
+
+ public boolean lockTable(String tablename) {
+ this.tableName = tablename;
+ return locked = dataSource.lockTable(connection, tableName);
+ }
+
+ public void resetInactivityTimer() {
+ Class<org.apache.tomcat.jdbc.pool.PooledConnection> iface = PooledConnection.class;
+ try {
+ PooledConnection pc = connection.unwrap(iface);
+ pc.setTimestamp(System.currentTimeMillis());
+ } catch (SQLException e) {
+ LOGGER.warn("Failed resetting timeout timer", e);
+ }
+ }
+
+ public boolean unlock() {
+ dataSource.unlockTable(connection);
+ return locked = false;
+ }
+
+ public boolean writeData(String statement, ArrayList<String> arguments) throws SQLException, Throwable
+ {
+ ArrayList<Object> newList=new ArrayList<Object>();
+ if(arguments != null && !arguments.isEmpty()) {
+ newList.addAll(arguments);
+ }
+ resetInactivityTimer();
+ return dataSource.executeUpdatePreparedStatement(connection, statement, newList, false);
+ }
+
+ public CachedRowSet getData(String statement, ArrayList<String> arguments) throws SQLException, Throwable
+ {
+ ArrayList<Object> newList=new ArrayList<Object>();
+ if(arguments != null && !arguments.isEmpty()) {
+ newList.addAll(arguments);
+ }
+ resetInactivityTimer();
+ return dataSource.executePreparedStatement(connection, statement, newList, false);
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException {
+ return connection.unwrap(iface);
+ }
+
+ @Override
+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
+ return connection.isWrapperFor(iface);
+ }
+
+ @Override
+ public Statement createStatement() throws SQLException {
+ return connection.createStatement();
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String sql) throws SQLException {
+ return connection.prepareStatement(sql);
+ }
+
+ @Override
+ public CallableStatement prepareCall(String sql) throws SQLException {
+ return connection.prepareCall(sql);
+ }
+
+ @Override
+ public String nativeSQL(String sql) throws SQLException {
+ return connection.nativeSQL(sql);
+ }
+
+ @Override
+ public void setAutoCommit(boolean autoCommit) throws SQLException {
+ connection.setAutoCommit(autoCommit);
+ }
+
+ @Override
+ public boolean getAutoCommit() throws SQLException {
+ return connection.getAutoCommit();
+ }
+
+ @Override
+ public void commit() throws SQLException {
+ connection.commit();
+ }
+
+ @Override
+ public void rollback() throws SQLException {
+ connection.rollback();
+ }
+
+ @Override
+ public void close() throws SQLException {
+ if(this.locked) {
+ try {
+ this.unlock();
+ } catch(Throwable th) {
+ LOGGER.error("Failed unlocking",th);
+ }
+ }
+ if(connection != null && !connection.isClosed()) {
+ connection.close();
+ }
+ dataSource.getPoolInfo(false);
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException {
+ return connection.isClosed();
+ }
+
+ @Override
+ public DatabaseMetaData getMetaData() throws SQLException {
+ return connection.getMetaData();
+ }
+
+ @Override
+ public void setReadOnly(boolean readOnly) throws SQLException {
+ connection.setReadOnly(readOnly);
+ }
+
+ @Override
+ public boolean isReadOnly() throws SQLException {
+ return connection.isReadOnly();
+ }
+
+ @Override
+ public void setCatalog(String catalog) throws SQLException {
+ connection.setCatalog(catalog);
+ }
+
+ @Override
+ public String getCatalog() throws SQLException {
+ return connection.getCatalog();
+ }
+
+ @Override
+ public void setTransactionIsolation(int level) throws SQLException {
+ connection.setTransactionIsolation(level);
+ }
+
+ @Override
+ public int getTransactionIsolation() throws SQLException {
+ return connection.getTransactionIsolation();
+ }
+
+ @Override
+ public SQLWarning getWarnings() throws SQLException {
+ return connection.getWarnings();
+ }
+
+ @Override
+ public void clearWarnings() throws SQLException {
+ connection.clearWarnings();
+ }
+
+ @Override
+ public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+ return connection.createStatement(resultSetType, resultSetConcurrency);
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
+ throws SQLException {
+ return connection.prepareStatement(sql, resultSetType, resultSetConcurrency);
+ }
+
+ @Override
+ public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
+ return connection.prepareCall(sql, resultSetType, resultSetConcurrency);
+ }
+
+ @Override
+ public Map<String, Class<?>> getTypeMap() throws SQLException {
+ return connection.getTypeMap();
+ }
+
+ @Override
+ public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+ connection.setTypeMap(map);
+ }
+
+ @Override
+ public void setHoldability(int holdability) throws SQLException {
+ connection.setHoldability(holdability);
+ }
+
+ @Override
+ public int getHoldability() throws SQLException {
+ return connection.getHoldability();
+ }
+
+ @Override
+ public Savepoint setSavepoint() throws SQLException {
+ return connection.setSavepoint();
+ }
+
+ @Override
+ public Savepoint setSavepoint(String name) throws SQLException {
+ return connection.setSavepoint(name);
+ }
+
+ @Override
+ public void rollback(Savepoint savepoint) throws SQLException {
+ connection.rollback(savepoint);
+ }
+
+ @Override
+ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+ connection.releaseSavepoint(savepoint);
+ }
+
+ @Override
+ public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
+ throws SQLException {
+ return connection.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
+ int resultSetHoldability) throws SQLException {
+ return connection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+ }
+
+ @Override
+ public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
+ int resultSetHoldability) throws SQLException {
+ return connection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+ return connection.prepareStatement(sql, autoGeneratedKeys);
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+ return connection.prepareStatement(sql, columnIndexes);
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+ return connection.prepareStatement(sql, columnNames);
+ }
+
+ @Override
+ public Clob createClob() throws SQLException {
+ return connection.createClob();
+ }
+
+ @Override
+ public Blob createBlob() throws SQLException {
+ return connection.createBlob();
+ }
+
+ @Override
+ public NClob createNClob() throws SQLException {
+ return connection.createNClob();
+ }
+
+ @Override
+ public SQLXML createSQLXML() throws SQLException {
+ return connection.createSQLXML();
+ }
+
+ @Override
+ public boolean isValid(int timeout) throws SQLException {
+ return connection.isValid(timeout);
+ }
+
+ @Override
+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
+ connection.setClientInfo(name, value);
+ }
+
+ @Override
+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
+ connection.setClientInfo(properties);
+ }
+
+ @Override
+ public String getClientInfo(String name) throws SQLException {
+ return connection.getClientInfo(name);
+ }
+
+ @Override
+ public Properties getClientInfo() throws SQLException {
+ return connection.getClientInfo();
+ }
+
+ @Override
+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+ return connection.createArrayOf(typeName, elements);
+ }
+
+ @Override
+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+ return connection.createStruct(typeName, attributes);
+ }
+
+ @Override
+ public void setSchema(String schema) throws SQLException {
+ connection.setSchema(schema);
+ }
+
+ @Override
+ public String getSchema() throws SQLException {
+ return connection.getSchema();
+ }
+
+ @Override
+ public void abort(Executor executor) throws SQLException {
+ connection.abort(executor);
+ }
+
+ @Override
+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+ connection.setNetworkTimeout(executor, milliseconds);
+ }
+
+ @Override
+ public int getNetworkTimeout() throws SQLException {
+ return connection.getNetworkTimeout();
+ }
+
+}
import java.util.Properties;
import java.util.Queue;
import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.sql.DataSource;
import javax.sql.rowset.CachedRowSet;
+import org.apache.tomcat.jdbc.pool.PoolExhaustedException;
import org.openecomp.sdnc.sli.resource.dblib.config.DbConfigPool;
import org.openecomp.sdnc.sli.resource.dblib.factory.AbstractDBResourceManagerFactory;
import org.openecomp.sdnc.sli.resource.dblib.factory.AbstractResourceManagerFactory;
import org.openecomp.sdnc.sli.resource.dblib.factory.DBConfigFactory;
import org.openecomp.sdnc.sli.resource.dblib.pm.PollingWorker;
import org.openecomp.sdnc.sli.resource.dblib.pm.SQLExecutionMonitor;
+import com.mysql.jdbc.exceptions.jdbc4.MySQLNonTransientConnectionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
}
}
- /* (non-Javadoc)
- * @see org.openecomp.dblib.DataAccessor#getData(java.lang.String, java.util.ArrayList)
- */
/* (non-Javadoc)
* @see org.openecomp.sdnc.sli.resource.dblib.DbLibService#getData(java.lang.String, java.util.ArrayList, java.lang.String)
*/
@Override
public CachedRowSet getData(String statement, ArrayList<String> arguments, String preferredDS) throws SQLException {
+ ArrayList<Object> newList=new ArrayList<Object>();
+ if(arguments != null && !arguments.isEmpty()) {
+ newList.addAll(arguments);
+ }
if(recoveryMode)
- return requestDataWithRecovery(statement, arguments, preferredDS);
+ return requestDataWithRecovery(statement, newList, preferredDS);
else
- return requestDataNoRecovery(statement, arguments, preferredDS);
+ return requestDataNoRecovery(statement, newList, preferredDS);
}
- private CachedRowSet requestDataWithRecovery(String statement, ArrayList<String> arguments, String preferredDS) throws SQLException {
+ private CachedRowSet requestDataWithRecovery(String statement, ArrayList<Object> arguments, String preferredDS) throws SQLException {
Throwable lastException = null;
CachedDataSource active = null;
} finally {
if(LOGGER.isDebugEnabled()){
time = (System.currentTimeMillis() - time);
- LOGGER.debug(">> getData : "+ active.getDbConnectionName()+" "+time+" miliseconds.");
+ LOGGER.debug("getData processing time : "+ active.getDbConnectionName()+" "+time+" miliseconds.");
}
}
}
}
}
- private CachedRowSet requestDataNoRecovery(String statement, ArrayList<String> arguments, String preferredDS) throws SQLException {
+ private CachedRowSet requestDataNoRecovery(String statement, ArrayList<Object> arguments, String preferredDS) throws SQLException {
if(dsQueue.isEmpty()){
LOGGER.error("Generated alarm: DBResourceManager.getData - No active DB connection pools are available.");
throw new DBLibException("No active DB connection pools are available in RequestDataNoRecovery call.");
}
- /* (non-Javadoc)
- * @see org.openecomp.dblib.DataAccessor#writeData(java.lang.String, java.util.ArrayList)
- */
/* (non-Javadoc)
* @see org.openecomp.sdnc.sli.resource.dblib.DbLibService#writeData(java.lang.String, java.util.ArrayList, java.lang.String)
*/
@Override
- public boolean writeData(String statement, ArrayList<String> arguments, String preferredDS) throws SQLException {
- return writeDataNoRecovery(statement, arguments, preferredDS);
+ public boolean writeData(String statement, ArrayList<String> arguments, String preferredDS) throws SQLException
+ {
+ ArrayList<Object> newList=new ArrayList<Object>();
+ if(arguments != null && !arguments.isEmpty()) {
+ newList.addAll(arguments);
+ }
+
+ return writeDataNoRecovery(statement, newList, preferredDS);
}
- CachedDataSource findMaster() {
+ CachedDataSource findMaster() throws PoolExhaustedException, MySQLNonTransientConnectionException {
CachedDataSource master = null;
CachedDataSource[] dss = this.dsQueue.toArray(new CachedDataSource[0]);
for(int i=0; i<dss.length; i++) {
}
- private boolean writeDataNoRecovery(String statement, ArrayList<String> arguments, String preferredDS) throws SQLException {
+ private boolean writeDataNoRecovery(String statement, ArrayList<Object> arguments, String preferredDS) throws SQLException {
if(dsQueue.isEmpty()){
LOGGER.error("Generated alarm: DBResourceManager.getData - No active DB connection pools are available.");
throw new DBLibException("No active DB connection pools are available in RequestDataNoRecovery call.");
} finally {
if(LOGGER.isDebugEnabled()){
time = (System.currentTimeMillis() - time);
- LOGGER.debug(">> getData : "+ active.getDbConnectionName()+" "+time+" miliseconds.");
+ LOGGER.debug("writeData processing time : "+ active.getDbConnectionName()+" "+time+" miliseconds.");
}
}
}
if(tmpActive != null) {
active = tmpActive;
}
- return active.getConnection();
+ return new DBLibConnection(active.getConnection(), active);
} catch(javax.sql.rowset.spi.SyncFactoryException exc){
LOGGER.debug("Free memory (bytes): " + Runtime.getRuntime().freeMemory());
LOGGER.warn("CLASSPATH issue. Allowing retry", exc);
lastException = exc;
+ } catch(PoolExhaustedException exc) {
+ throw new NoAvailableConnectionsException(exc);
+ } catch(MySQLNonTransientConnectionException exc){
+ throw new NoAvailableConnectionsException(exc);
} catch(Exception exc){
lastException = exc;
if(recoveryMode){
handleGetConnectionException(active, exc);
} else {
- if(exc instanceof SQLException)
+ if(exc instanceof MySQLNonTransientConnectionException) {
+ throw new NoAvailableConnectionsException(exc);
+ } if(exc instanceof SQLException) {
throw (SQLException)exc;
- else {
+ } else {
DBLibException excptn = new DBLibException(exc.getMessage());
excptn.setStackTrace(exc.getStackTrace());
throw excptn;
return "";
}
- private String getPreferredDataSourceName(AtomicBoolean flipper) {
+ public String getPreferredDataSourceName(AtomicBoolean flipper) {
LinkedList<CachedDataSource> snapshot = new LinkedList<CachedDataSource>(dsQueue);
if(snapshot.size() > 1){
return snapshot.peek().getDbConnectionName();
}
- /*
- private void runTest(){
- Thread producer = null;
-
- producer = new ProducerThread("Prod1");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod2");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod3");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod4");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod5");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod6");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod7");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod8");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Prod9");
- producer.setDaemon(true);
- producer.start();
-
- producer = new ProducerThread("Pro10");
- producer.setDaemon(true);
- producer.start();
-
- }
-
- private final class ProducerThread extends Thread {
- private ProducerThread(String threadName) {
- super(threadName);
- }
-
- public void run()
- {
- String name = null;
- for(int i=0; i<(Integer.MAX_VALUE-1); i++)
- {
- try {
- name = getPreferredDataSourceName(dsSelector);
- if(name.contains("BACK")){
- LOGGER.error(this.getName()+": <====== ");
- } else {
- LOGGER.error(this.getName()+": ======>");
- }
- CachedRowSet rs = null;
- rs = getData("select 1 from dual", new ArrayList<String>(), name);
- rs.close();
- rs = getData("select 1 from dual", new ArrayList<String>(), name);
- rs.close();
- rs = getData("select 1 from dual", new ArrayList<String>(), name);
- rs.close();
- rs = getData("select 1 from dual", new ArrayList<String>(), name);
- rs.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- try {
- Thread.sleep(50L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- return;
- }
- }
-*/
+ class RemindTask extends TimerTask {
+ public void run() {
+ CachedDataSource ds = dsQueue.peek();
+ if(ds != null)
+ ds.getPoolInfo(false);
+ }
+ }
}
* ============LICENSE_END=========================================================
*/
-package org.openecomp.sdnc.sli.resource.dblib.config;
+package org.openecomp.sdnc.sli.resource.dblib;
-import java.util.Properties;
+import java.sql.SQLException;
-public class JndiConfiguration extends BaseDBConfiguration{
+public class NoAvailableConnectionsException extends SQLException {
- public JndiConfiguration(Properties xmlElem) {
- super(xmlElem);
- // TODO Auto-generated constructor stub
- }
-
- public String getJndiConnectionName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getJndiContextFactory() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getJndiURL() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getJndiSource() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setJndiContextFactory(String jndiContextFactoryStr) {
- // TODO Auto-generated method stub
-
- }
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6259205931674413018L;
- public void setJndiURL(String jndiURLStr) {
- // TODO Auto-generated method stub
-
+ public NoAvailableConnectionsException(Exception exc) {
+ super(exc);
}
}
}
static DbConfigPool getConfigparams(Properties properties){
- LoggerFactory.getLogger(DBConfigFactory.class).info(properties.toString());
DbConfigPool xmlConfig = new DbConfigPool(properties);
ArrayList<Properties> propertySets = new ArrayList<Properties>();
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01,sdnctldb02
org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl
org.openecomp.sdnc.sli.jdbc.database=sdnctl
-org.openecomp.sdnc.sli.jdbc.user=sdnctl
+org.openecomp.sdnc.sli.jdbc.user={user for sdnctl}
org.openecomp.sdnc.sli.jdbc.password={password for sdnctl}
org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01
org.openecomp.sdnc.sli.jdbc.request.timeout=100
org.openecomp.sdnc.sli.jdbc.limit.init=10
org.openecomp.sdnc.sli.jdbc.limit.min=10
-org.openecomp.sdnc.sli.jdbc.limit.max=20
\ No newline at end of file
+org.openecomp.sdnc.sli.jdbc.limit.max=20
+++ /dev/null
-org.openecomp.sdnc.sli.dbtype=jdbc
-
-org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01
-org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database=sdnctl
-org.openecomp.sdnc.sli.jdbc.user=user
-org.openecomp.sdnc.sli.jdbc.password=password
-org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01
-
-org.openecomp.sdnc.sli.jdbc.connection.timeout=50
-org.openecomp.sdnc.sli.jdbc.request.timeout=100
-org.openecomp.sdnc.sli.jdbc.limit.init=10
-org.openecomp.sdnc.sli.jdbc.limit.min=10
-org.openecomp.sdnc.sli.jdbc.limit.max=20
-
-org.openecomp.dblib.connection.recovery=false
\ No newline at end of file
Code Review / sdnc / core.git / commitdiff