You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2017/02/26 19:46:47 UTC
[1/3] storm git commit: STORM-2381: Add logging of JDBC connection
string in storm-jdbc integration for debugging failures
Repository: storm
Updated Branches:
refs/heads/master b73a772e2 -> 34406ec81
STORM-2381: Add logging of JDBC connection string in storm-jdbc integration for debugging failures
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0201af36
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0201af36
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0201af36
Branch: refs/heads/master
Commit: 0201af3648ff8bed897ad79e4fbf61e9f942c110
Parents: 71c35dd
Author: Hiro Kuwabara <tk...@hortonworks.com>
Authored: Thu Feb 23 16:55:47 2017 -0800
Committer: Hiro Kuwabara <tk...@hortonworks.com>
Committed: Fri Feb 24 11:53:05 2017 -0800
----------------------------------------------------------------------
.../storm/jdbc/common/HikariCPConnectionProvider.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0201af36/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java
index 1aa377f..3f3151d 100644
--- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java
+++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java
@@ -25,7 +25,11 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class HikariCPConnectionProvider implements ConnectionProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(HikariCPConnectionProvider.class);
private Map<String, Object> configMap;
private transient HikariDataSource dataSource;
@@ -40,6 +44,12 @@ public class HikariCPConnectionProvider implements ConnectionProvider {
Properties properties = new Properties();
properties.putAll(configMap);
HikariConfig config = new HikariConfig(properties);
+ if(properties.containsKey("dataSource.url")) {
+ LOG.info("DataSource Url: " + properties.getProperty("dataSource.url"));
+ }
+ else if (config.getJdbcUrl() != null) {
+ LOG.info("JDBC Url: " + config.getJdbcUrl());
+ }
this.dataSource = new HikariDataSource(config);
this.dataSource.setAutoCommit(false);
}
[3/3] storm git commit: Added STORM-2381 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-2381 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/34406ec8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/34406ec8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/34406ec8
Branch: refs/heads/master
Commit: 34406ec81d0257847bf8b7984edd5406d51b7f29
Parents: 8224c6b
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Feb 26 11:29:10 2017 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Feb 26 11:29:10 2017 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/34406ec8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2948e2..b0a27a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -205,6 +205,7 @@
## 1.1.1
* STORM-1363: TridentKafkaState should handle null values from TridentTupleToKafkaMapper.getMessageFromTuple()
+* STORM-2381: Add logging of JDBC connection string in storm-jdbc integration for debugging failures.
## 1.1.0
* STORM-2340: fix AutoCommitMode issue in KafkaSpout
[2/3] storm git commit: Merge branch 'STORM-2381' of
https://github.com/tkuwabara789/storm into STORM-2381
Posted by sr...@apache.org.
Merge branch 'STORM-2381' of https://github.com/tkuwabara789/storm into STORM-2381
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8224c6b6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8224c6b6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8224c6b6
Branch: refs/heads/master
Commit: 8224c6b60957f9e0ddd208c98d4819e30e78fe51
Parents: b73a772 0201af3
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Feb 26 11:27:50 2017 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Feb 26 11:27:50 2017 -0800
----------------------------------------------------------------------
.../storm/jdbc/common/HikariCPConnectionProvider.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------