Вернуть crash-safe запись AddBlock через tmp_bch

2026-06-26 17:05:37 +04:00
parent 1ced351ea2
commit 71fdee0cfd
10 changed files with 468 additions and 216 deletions
@@ -9,8 +9,10 @@ import java.util.Objects;
 *  FileStoreUtil — утилита работы с файлами в папке data/.
 *
 *  Теперь поддерживает:
- *   - основной файл блокчейна:   <blockchainName>.bch
- *   - временный файл блокчейна:  <blockchainName>.tmp_bch
+ *   - основной файл блокчейна:       <blockchainName>.bch
+ *   - временный файл блокчейна:      <blockchainName>.tmp_bch
+ *   - sidecar-файл проверки записи:  <blockchainName>.write_check
+ *   - marker-файл записи:            <blockchainName>.write_pending
 *
 *  Важное:
 *   - validateSimpleFileName() запрещает path traversal.
@@ -32,6 +34,12 @@ public final class FileStoreUtil {
    /** Маркер того, что chain сейчас в процессе полного resync. */
    public static final String BLOCKCHAIN_RESYNC_MARKER_EXTENSION = ".resync_pending";

+    /** Marker того, что обычный AddBlock находится в опасной фазе записи. */
+    public static final String BLOCKCHAIN_WRITE_PENDING_MARKER_EXTENSION = ".write_pending";
+
+    /** Sidecar-файл с blockNumber/blockHash для обычного AddBlock. */
+    public static final String BLOCKCHAIN_WRITE_CHECK_EXTENSION = ".write_check";
+
    private static final FileStoreUtil INSTANCE = new FileStoreUtil();

    private final Path dataDirPath;
@@ -133,6 +141,37 @@ public final class FileStoreUtil {
        newFile(buildBlockchainTmpFileName(blockchainName), data);
    }

+    /** <blockchainName>.write_check */
+    public String buildBlockchainWriteCheckFileName(String blockchainName) {
+        validateSimpleFileName(blockchainName);
+        return blockchainName + BLOCKCHAIN_WRITE_CHECK_EXTENSION;
+    }
+
+    public Path resolveBlockchainWriteCheckPath(String blockchainName) {
+        return resolveSafe(buildBlockchainWriteCheckFileName(blockchainName));
+    }
+
+    public void writeBlockchainWriteCheck(String blockchainName, int blockNumber, String blockHashHex) {
+        StringBuilder sb = new StringBuilder(128);
+        sb.append("blockNumber=").append(blockNumber).append('\n');
+        sb.append("blockHash=").append(blockHashHex == null ? "" : blockHashHex).append('\n');
+        newFile(buildBlockchainWriteCheckFileName(blockchainName), sb.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8));
+    }
+
+    /** <blockchainName>.write_pending */
+    public String buildBlockchainWritePendingMarkerFileName(String blockchainName) {
+        validateSimpleFileName(blockchainName);
+        return blockchainName + BLOCKCHAIN_WRITE_PENDING_MARKER_EXTENSION;
+    }
+
+    public Path resolveBlockchainWritePendingMarkerPath(String blockchainName) {
+        return resolveSafe(buildBlockchainWritePendingMarkerFileName(blockchainName));
+    }
+
+    public void writeBlockchainWritePendingMarker(String blockchainName) {
+        newFile(buildBlockchainWritePendingMarkerFileName(blockchainName), new byte[0]);
+    }
+
    /** <blockchainName>.resync_pending */
    public String buildBlockchainResyncMarkerFileName(String blockchainName) {
        validateSimpleFileName(blockchainName);
@@ -167,6 +206,14 @@ public final class FileStoreUtil {
        deleteIfExists(resolveBlockchainTmpPath(blockchainName));
    }

+    public void deleteBlockchainWriteCheckIfExists(String blockchainName) {
+        deleteIfExists(resolveBlockchainWriteCheckPath(blockchainName));
+    }
+
+    public void deleteBlockchainWritePendingMarkerIfExists(String blockchainName) {
+        deleteIfExists(resolveBlockchainWritePendingMarkerPath(blockchainName));
+    }
+
    public void deleteBlockchainResyncMarkerIfExists(String blockchainName) {
        deleteIfExists(resolveBlockchainResyncMarkerPath(blockchainName));
    }