diff --git a/CHANGES.md b/CHANGES.md index b446b0cee21fee53a75539e7b9a0b8f1e98869f4..15e23b67f1b14ac456a08588999f51cc9215a81e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -26,6 +26,7 @@ Release Notes. * Improve the queryable tags generation. Remove the duplicated tags to reduce the storage payload. * Fix the excessive timeout period set by the kubernetes-client. * Fix deadlock problem when using elasticsearch-client-7.0.0. +* Fix storage-jdbc isExists not set dbname. #### UI diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java index 62f615f53f8c9962ca5109c759c56e5be4e82751..978098b8e9acdeb855297d2a39358dbc70028f7a 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java @@ -58,7 +58,7 @@ public class MySQLTableInstaller extends H2TableInstaller { TableMetaInfo.addModel(model); JDBCHikariCPClient h2Client = (JDBCHikariCPClient) client; try (Connection conn = h2Client.getConnection()) { - try (ResultSet rset = conn.getMetaData().getTables(null, null, model.getName(), null)) { + try (ResultSet rset = conn.getMetaData().getTables(conn.getCatalog(), null, model.getName(), null)) { if (rset.next()) { return true; }