You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2024/05/29 14:37:07 UTC
(skywalking) branch banyandb-debug created (now 94904074da)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch banyandb-debug
in repository https://gitbox.apache.org/repos/asf/skywalking.git
at 94904074da Fix day interval
This branch includes the following new commits:
new ee73ad1cce Add debug info for duplicated data
new 94904074da Fix day interval
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(skywalking) 02/02: Fix day interval
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch banyandb-debug
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 94904074dafc963c4d810b2aa8e2e008371b5553
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed May 29 13:54:55 2024 +0000
Fix day interval
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
.../oap/server/storage/plugin/banyandb/MetadataRegistry.java | 2 +-
.../storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
index 2525fc6c3c..bc3dc3de83 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
@@ -278,7 +278,7 @@ public enum MetadataRegistry {
case Minute:
return Duration.ofMinutes(1);
case Day:
- return Duration.ofDays(1);
+ return Duration.ofHours(24);
default:
throw new UnsupportedOperationException("unsupported downSampling interval");
}
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
index d64f674038..f637060ee0 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableSet;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -229,7 +230,7 @@ public class BanyanDBMetricsQueryDAO extends AbstractBanyanDBDAO implements IMet
long timeBucket = TimeBucket.getTimeBucket(dp.getTimestamp(), schema.getMetadata().getDownSampling());
DataPoint preDp = map.putIfAbsent(timeBucket, dp);
if (preDp != null) {
- log.warn("{}:{} returns duplicated data point at {}, pre:{}, current:{}", entityID, schema.getMetadata(), timeBucket, preDp.getFields(), dp.getFields());
+ log.warn("{}:{} returns duplicated data point at {}, pre:{}, current:{} \n Stack Trace: {}", entityID, schema.getMetadata(), timeBucket, preDp.getFields(), dp.getFields(), Arrays.toString(Thread.currentThread().getStackTrace()));
}
}
(skywalking) 01/02: Add debug info for duplicated data
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch banyandb-debug
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit ee73ad1cced5e8849aabc448595ed7a7d8154f26
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Sun May 26 23:56:22 2024 +0000
Add debug info for duplicated data
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
.../storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
index 5d98f933f1..d64f674038 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java
@@ -227,8 +227,9 @@ public class BanyanDBMetricsQueryDAO extends AbstractBanyanDBDAO implements IMet
});
for (final DataPoint dp : resp.getDataPoints()) {
long timeBucket = TimeBucket.getTimeBucket(dp.getTimestamp(), schema.getMetadata().getDownSampling());
- if (map.putIfAbsent(timeBucket, dp) != null) {
- log.warn("duplicated data point at " + timeBucket);
+ DataPoint preDp = map.putIfAbsent(timeBucket, dp);
+ if (preDp != null) {
+ log.warn("{}:{} returns duplicated data point at {}, pre:{}, current:{}", entityID, schema.getMetadata(), timeBucket, preDp.getFields(), dp.getFields());
}
}