fix(s3stream): register metrics after starting the wal (#920)

Signed-off-by: Ning Yu <[email protected]>
AutoMQ · Feb 5, 2024 · 28925da · 28925da
1 parent 7c35c31
commit 28925da
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/s3stream/src/main/java/com/automq/stream/s3/wal/BlockWALService.java b/s3stream/src/main/java/com/automq/stream/s3/wal/BlockWALService.java
@@ -290,7 +290,11 @@ public WriteAheadLog start() throws IOException {
         walHeaderReady(header);
 
         started.set(true);
+        LOGGER.info("block WAL service started, cost: {} ms", stopWatch.getTime(TimeUnit.MILLISECONDS));
+        return this;
+    }
 
+    private void registerMetrics() {
         S3StreamMetricsManager.registerDeltaWalOffsetSupplier(() -> {
             try {
                 return this.getCurrentStartOffset();
@@ -299,9 +303,6 @@ public WriteAheadLog start() throws IOException {
                 return 0L;
             }
         }, () -> walHeader.getFlushedTrimOffset());
-
-        LOGGER.info("block WAL service started, cost: {} ms", stopWatch.getTime(TimeUnit.MILLISECONDS));
-        return this;
     }
 
     private long getCurrentStartOffset() {
@@ -480,7 +481,14 @@ public CompletableFuture<Void> reset() {
             slidingWindowService.start(walHeader.getAtomicSlidingWindowMaxLength(), recoveryCompleteOffset);
         }
         LOGGER.info("reset sliding window to offset: {}", recoveryCompleteOffset);
-        return trim(recoveryCompleteOffset - 1, true).thenRun(() -> resetFinished.set(true));
+        CompletableFuture<Void> cf = trim(recoveryCompleteOffset - 1, true)
+            .thenRun(() -> resetFinished.set(true));
+
+        if (!recoveryMode) {
+            // Only register metrics when not in recovery mode
+            return cf.thenRun(this::registerMetrics);
+        }
+        return cf;
     }
 
     @Override