You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/08/09 04:59:04 UTC
[skywalking] branch master updated: Fix #9440, `batchDAO.endOfFlush();` should be called after all executions are ready. (#9441)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 053ae3f882 Fix #9440, `batchDAO.endOfFlush();` should be called after all executions are ready. (#9441)
053ae3f882 is described below
commit 053ae3f88279e50af0b3ff0ae55f0efb2d2ddaf4
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Aug 9 12:58:50 2022 +0800
Fix #9440, `batchDAO.endOfFlush();` should be called after all executions are ready. (#9441)
---
.../apache/skywalking/oap/server/core/storage/PersistenceTimer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java
index 6bf7ed779c..1ed2f700f5 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java
@@ -136,8 +136,9 @@ public enum PersistenceTimer {
.whenComplete(($1, $2) -> executeLatencyTimer.close());
}, prepareExecutorService);
}).toArray(CompletableFuture[]::new));
- batchDAO.endOfFlush();
+
future.whenComplete((unused, throwable) -> {
+ batchDAO.endOfFlush();
allTimer.close();
if (log.isDebugEnabled()) {
log.debug(