refactor(log): drop manifest probe from LevelDB open watchdog

Author: halibobo1205

chainbase/src/main/java/org/tron/common/storage/leveldb/LevelDbDataSourceImpl.java

@@ -20,9 +20,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Bytes;
-import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -31,14 +29,12 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
@@ -73,8 +69,6 @@ public class LevelDbDataSourceImpl extends DbStat implements DbSourceInter<byte[
   private static final long OPEN_WATCHDOG_INITIAL_DELAY_SEC = 60;
   /** Subsequent watchdog WARN lines are emitted on this interval. */
   private static final long OPEN_WATCHDOG_PERIOD_SEC = 30;
-  /** Value of {@code Filename.currentFileName()}. */
-  private static final String LEVELDB_CURRENT_FILE = "CURRENT";
 
   private String dataBaseName;
   private DB database;
@@ -137,11 +131,10 @@ private void openDatabase(Options dbOptions) throws IOException {
       Files.createDirectories(dbPath.getParent());
     }
     final long openStartNs = System.nanoTime();
-    final AtomicReference<String> manifestInfo = new AtomicReference<>();
     ScheduledExecutorService watchdog = ExecutorServiceManager
         .newSingleThreadScheduledExecutor("db-open-watchdog-" + dataBaseName, true);
     ScheduledFuture<?> watchdogTask = watchdog.scheduleAtFixedRate(
-        () -> logSlowOpen(dbPath, openStartNs, manifestInfo),
+        () -> logSlowOpen(dbPath, openStartNs),
         OPEN_WATCHDOG_INITIAL_DELAY_SEC,
         OPEN_WATCHDOG_PERIOD_SEC,
         TimeUnit.SECONDS);
@@ -173,47 +166,21 @@ private void openDatabase(Options dbOptions) throws IOException {
    * Emits a WARN when factory.open() is still blocked — usually because the
    * MANIFEST has grown large enough to make replay expensive.
    */
-  void logSlowOpen(Path dbPath, long startNs, AtomicReference<String> manifestInfoCache) {
+  void logSlowOpen(Path dbPath, long startNs) {
     try {
       long elapsedSec = TimeUnit.NANOSECONDS.toSeconds(System.nanoTime() - startNs);
-      String manifestInfo = manifestInfoCache.get();
-      if (manifestInfo == null) {
-        manifestInfo = resolveManifestInfo(dbPath.toFile());
-        manifestInfoCache.compareAndSet(null, manifestInfo);
-      }
-      logger.warn("DB {} open still in progress after {}s. path={}, {}. "
+      logger.warn("DB {} open still in progress after {}s. path={}. "
               + "This startup will complete; to speed up future restarts, run "
               + "`java -jar Toolkit.jar db archive -d {}` before the next startup "
               + "to rebuild the MANIFEST (the tool requires an exclusive DB lock, "
               + "so it cannot run while the node is up).",
-          dataBaseName, elapsedSec, dbPath, manifestInfo, parentPath);
+          dataBaseName, elapsedSec, dbPath, parentPath);
     } catch (Exception e) {
       // Purely observational - never let the watchdog disrupt startup.
       logger.debug("db-open-watchdog failure for {}: {}", dataBaseName, e.getMessage());
     }
   }
 
-  private static String resolveManifestInfo(File dbDir) {
-    File currentFile = new File(dbDir, LEVELDB_CURRENT_FILE);
-    String name = "none";
-    long size = 0;
-    if (currentFile.isFile()) {
-      try {
-        name = new String(Files.readAllBytes(currentFile.toPath()),
-            StandardCharsets.UTF_8).trim();
-        File manifest = new File(dbDir, name);
-        if (manifest.isFile()) {
-          size = manifest.length();
-        }
-      } catch (IOException ignored) {
-        // Best-effort — keep defaults. A new DB won't hit the 60s threshold
-        // anyway, so reporting 0.00 MB here is the expected shape.
-      }
-    }
-    return String.format(Locale.ROOT, "MANIFEST=%s (%.2f MB)", name,
-        size / 1024.0 / 1024.0);
-  }
-
   public Path getDbPath() {
     return Paths.get(parentPath, dataBaseName);
   }

framework/src/test/java/org/tron/common/storage/leveldb/LevelDbDataSourceImplTest.java

@@ -29,12 +29,9 @@
 import ch.qos.logback.core.read.ListAppender;
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -147,17 +144,13 @@ public void slowOpen() throws IOException {
     try {
       final File dbDir = temporaryFolder.newFolder();
       final Path dbPath = dbDir.toPath();
-      final String manifest = "MANIFEST-000042";
       final String watchdogDbName = "slow-open-db";
-      Files.write(dbPath.resolve(manifest), new byte[1024 * 1024]);
-      Files.write(dbPath.resolve("CURRENT"), (manifest + "\n").getBytes(StandardCharsets.UTF_8));
 
       LevelDbDataSourceImpl ds = new LevelDbDataSourceImpl();
       ReflectUtils.setFieldValue(ds, "dataBaseName", watchdogDbName);
       ReflectUtils.setFieldValue(ds, "parentPath", dbDir.getParent());
       long startNs = System.nanoTime() - TimeUnit.SECONDS.toNanos(61);
-      AtomicReference<String> cache = new AtomicReference<>();
-      ds.logSlowOpen(dbPath, startNs, cache);
+      ds.logSlowOpen(dbPath, startNs);
 
       List<ILoggingEvent> warns = dbAppender.list.stream()
           .filter(e -> e.getLevel() == Level.WARN)
@@ -166,15 +159,10 @@ public void slowOpen() throws IOException {
       ILoggingEvent warn = warns.get(0);
       assertNotNull("expected one WARN from the watchdog helper", warn);
       String rendered = warn.getFormattedMessage();
-      assertTrue("WARN should mention the MANIFEST filename: " + rendered,
-          rendered.contains(manifest));
-      assertTrue("WARN should include MANIFEST size in MB: " + rendered,
-          rendered.contains("(1.00 MB)"));
       assertTrue("WARN should include the Toolkit remediation hint: " + rendered,
           rendered.contains("Toolkit.jar db archive -d"));
       assertTrue("WARN should echo the db name: " + rendered,
           rendered.contains(watchdogDbName));
-      assertNotNull("cache should hold the resolved MANIFEST info", cache.get());
     } finally {
       dbAppender.stop();
       dbLogger.detachAppender(dbAppender);