From 957d549b68421dbf772ea30a1afc72dc824ba918 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 15 Dec 2020 16:05:03 +0800 Subject: [PATCH] [ISSUE 5541] Fix H2 in-memory database table missing issues (#6008) * add ;DB_CLOSE_DELAY=-1 to the database URL * Update CHANGES log * add ;DB_CLOSE_DELAY=-1 to the H2 database URL of application.yml Co-authored-by: zhanglei36 --- CHANGES.md | 1 + oap-server/server-bootstrap/src/main/resources/application.yml | 2 +- .../oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 919b589ea..8b629fbcb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ Release Notes. * Fix potential gRPC connection leak(not closed) for the channels among OAP instances. * Filter OAP instances(unassigned in booting stage) of the empty IP in KubernetesCoordinator. * Add component ID for Python aiohttp plugin requester and server. +* Fix H2 in-memory database table missing issues #### UI * Fix un-removed tags in trace query. diff --git a/oap-server/server-bootstrap/src/main/resources/application.yml b/oap-server/server-bootstrap/src/main/resources/application.yml index ca2723571..04edb32c9 100755 --- a/oap-server/server-bootstrap/src/main/resources/application.yml +++ b/oap-server/server-bootstrap/src/main/resources/application.yml @@ -154,7 +154,7 @@ storage: advanced: ${SW_STORAGE_ES_ADVANCED:""} h2: driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource} - url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db} + url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db;DB_CLOSE_DELAY=-1} user: ${SW_STORAGE_H2_USER:sa} metadataQueryMaxSize: ${SW_STORAGE_H2_QUERY_MAX_SIZE:5000} maxSizeOfArrayColumn: ${SW_STORAGE_MAX_SIZE_OF_ARRAY_COLUMN:20} diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java index 75667e63d..06b8b2623 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java @@ -26,7 +26,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleConfig; @Getter public class H2StorageConfig extends ModuleConfig { private String driver = "org.h2.jdbcx.JdbcDataSource"; - private String url = "jdbc:h2:mem:skywalking-oap-db"; + private String url = "jdbc:h2:mem:skywalking-oap-db;DB_CLOSE_DELAY=-1"; private String user = ""; private String password = ""; private int metadataQueryMaxSize = 5000;