This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch enhance-fix in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f20807a8451c4eb4c7c9cd6c9cbe9b42f75db9a9 Author: Wu Sheng <[email protected]> AuthorDate: Tue Aug 9 09:24:12 2022 +0800 Fix #9440, `batchDAO.endOfFlush();` should be called after all executions are ready. --- .../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(
