This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch h2-fix in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 613e5f85c6bfc244f8c5f7bf8b15740af8bd4292 Author: Wu Sheng <[email protected]> AuthorDate: Sun Jul 21 14:52:03 2019 +0800 Fix H2 metrics read bug, can't read expected existing metrics. Make agent mock works as usual. --- .../server/receiver/trace/mock/AgentDataMock.java | 13 +++++--- .../storage/plugin/jdbc/h2/dao/H2BatchDAO.java | 15 ++++++--- .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 38 ++++++++++++++++------ 3 files changed, 47 insertions(+), 19 deletions(-) diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java index ebf0bb7..e6010f7 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/AgentDataMock.java @@ -18,11 +18,14 @@ package org.apache.skywalking.oap.server.receiver.trace.mock; -import io.grpc.*; +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; import io.grpc.stub.StreamObserver; import java.util.concurrent.TimeUnit; -import org.apache.skywalking.apm.network.language.agent.*; -import org.joda.time.DateTime; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.TraceSegmentServiceGrpc; +import org.apache.skywalking.apm.network.language.agent.UniqueId; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; /** * @author peng-yongsheng @@ -39,8 +42,8 @@ public class AgentDataMock { StreamObserver<UpstreamSegment> streamObserver = createStreamObserver(); UniqueId.Builder globalTraceId = UniqueIdBuilder.INSTANCE.create(); -// long startTimestamp = System.currentTimeMillis(); - long startTimestamp = new DateTime().minusDays(2).getMillis(); + long startTimestamp = System.currentTimeMillis(); + //long startTimestamp = new DateTime().minusDays(2).getMillis(); // ServiceAMock ServiceAMock serviceAMock = new ServiceAMock(registerMock); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java index a227c7d..bfc8148 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java @@ -18,14 +18,16 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; -import java.sql.*; +import java.sql.Connection; +import java.sql.SQLException; import java.util.List; import org.apache.skywalking.oap.server.core.storage.IBatchDAO; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLExecutor; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author wusheng, peng-yongsheng @@ -51,8 +53,13 @@ public class H2BatchDAO implements IBatchDAO { try (Connection connection = h2Client.getConnection()) { for (Object exe : collection) { - SQLExecutor sqlExecutor = (SQLExecutor)exe; - sqlExecutor.invoke(connection); + try { + SQLExecutor sqlExecutor = (SQLExecutor)exe; + sqlExecutor.invoke(connection); + } catch (SQLException e) { + // Just avoid one execution failure makes the rest of batch failure. + logger.error(e.getMessage(), e); + } } } catch (SQLException | JDBCClientException e) { logger.error(e.getMessage(), e); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java index 049bee3..142770d 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java @@ -19,17 +19,27 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.StorageData; import org.apache.skywalking.oap.server.core.storage.model.ModelColumn; import org.apache.skywalking.oap.server.core.storage.type.StorageDataType; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.apache.skywalking.oap.server.storage.plugin.jdbc.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.ArrayParamBuilder; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLBuilder; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLExecutor; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.TableMetaInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author wusheng, peng-yongsheng @@ -49,9 +59,14 @@ public class H2SQLExecutor { try (ResultSet rs = h2Client.executeQuery(connection, "SELECT * FROM " + modelName + " WHERE id in (" + param + ")")) { List<StorageData> storageDataList = new ArrayList<>(); - while (rs.next()) { - storageDataList.add(toStorageData(rs, modelName, storageBuilder)); + StorageData storageData; + do { + storageData = toStorageData(rs, modelName, storageBuilder); + if (storageData != null) { + storageDataList.add(storageData); + } } + while (storageData != null); return storageDataList; } } catch (SQLException | JDBCClientException e) { @@ -81,7 +96,8 @@ public class H2SQLExecutor { } } - protected StorageData toStorageData(ResultSet rs, String modelName, StorageBuilder storageBuilder) throws SQLException { + protected StorageData toStorageData(ResultSet rs, String modelName, + StorageBuilder storageBuilder) throws SQLException { if (rs.next()) { Map data = new HashMap(); List<ModelColumn> columns = TableMetaInfo.get(modelName).getColumns(); @@ -106,7 +122,8 @@ public class H2SQLExecutor { return Const.NONE; } - protected SQLExecutor getInsertExecutor(String modelName, StorageData metrics, StorageBuilder storageBuilder) throws IOException { + protected SQLExecutor getInsertExecutor(String modelName, StorageData metrics, + StorageBuilder storageBuilder) throws IOException { Map<String, Object> objectMap = storageBuilder.data2Map(metrics); SQLBuilder sqlBuilder = new SQLBuilder("INSERT INTO " + modelName + " VALUES"); @@ -133,7 +150,8 @@ public class H2SQLExecutor { return new SQLExecutor(sqlBuilder.toString(), param); } - protected SQLExecutor getUpdateExecutor(String modelName, StorageData metrics, StorageBuilder storageBuilder) throws IOException { + protected SQLExecutor getUpdateExecutor(String modelName, StorageData metrics, + StorageBuilder storageBuilder) throws IOException { Map<String, Object> objectMap = storageBuilder.data2Map(metrics); SQLBuilder sqlBuilder = new SQLBuilder("UPDATE " + modelName + " SET ");
