kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make metrics exporter still work even when storage layer failed (#7041)

This commit is contained in:
Zhenxu 2021-05-31 17:37:58 +08:00 committed by GitHub
parent bd38ec492e
commit 9e66bee7a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -32,7 +32,7 @@ Release Notes.
* Introduce method interceptor API v2
* Fix ClassCast issue for RequestHolder/ResponseHolder.
* fixed `jdk-threading-plugin` memory leak.
* Optimize multiple field reflection opeartion in Fiegn plugin.
* Optimize multiple field reflection operation in Feign plugin.
#### OAP-Backend
* BugFix: filter invalid Envoy access logs whose socket address is empty.
@ -57,6 +57,7 @@ Release Notes.
* Events can be configured as alarm source.
* Make the number of core worker in meter converter thread pool configurable.
* Add HTTP implementation of logs reporting protocol.
* Make metrics exporter still work even when storage layer failed.
#### UI
* Add logo for kong plugin.

24
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
View File

@ -18,7 +18,6 @@
package org.apache.skywalking.oap.server.core.analysis.worker;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@ -209,16 +208,23 @@ public class MetricsPersistentWorker extends PersistenceWorker<Metrics> {
/**
* Load data from the storage, if {@link #enableDatabaseSession} == true, only load data when the id doesn't exist.
*/
private void loadFromStorage(List<Metrics> metrics) throws IOException {
if (!enableDatabaseSession) {
context.clear();
private void loadFromStorage(List<Metrics> metrics) {
try {
List<Metrics> noInCacheMetrics = metrics.stream()
.filter(m -> !context.containsKey(m) || !enableDatabaseSession)
.collect(Collectors.toList());
if (noInCacheMetrics.isEmpty()) {
return;
}
List<Metrics> noInCacheMetrics = metrics.stream()
.filter(m -> !context.containsKey(m))
.collect(Collectors.toList());
if (!noInCacheMetrics.isEmpty()) {
metricsDAO.multiGet(model, noInCacheMetrics).forEach(m -> context.put(m, m));
final List<Metrics> dbMetrics = metricsDAO.multiGet(model, noInCacheMetrics);
if (!enableDatabaseSession) {
// Clear the cache only after results from DB are returned successfully.
context.clear();
}
dbMetrics.forEach(m -> context.put(m, m));
} catch (final Exception e) {
log.error("Failed to load metrics for merging", e);
}
}