aidar/SHiNE-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавить startup recovery для resync цепочек

Browse Source
This commit is contained in:
AidarKC
2026-06-26 15:51:52 +04:00
parent be4f76834a
commit c048347f2e
8 changed files with 256 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SHiNE-server/shine-server-blockchain/src/main/java/utils/files/FileStoreUtil.java
+4
View File
@@ -171,6 +171,10 @@ public final class FileStoreUtil {
deleteIfExists(resolveBlockchainResyncMarkerPath(blockchainName));
}
public boolean existsBlockchainResyncMarker(String blockchainName) {
return exists(buildBlockchainResyncMarkerFileName(blockchainName));
}
/**
* Атомарно заменить основной файл блокчейна временным:
* <name>.tmp_bch -> <name>.bch
SHiNE-server/shine-server-net-protocol/src/main/java/server/sync/BlockchainResyncGuard.java
+9 -1
View File
@@ -4,6 +4,8 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import utils.files.FileStoreUtil;
/**
* In-memory guard для цепочек, которые сейчас находятся в полном resync.
*
@@ -34,7 +36,13 @@ public final class BlockchainResyncGuard {
public static boolean isBlockedForExternalAddBlock(String blockchainName) {
String key = normalize(blockchainName);
if (key == null) return false;
return ACTIVE.contains(key) && !isBypassed(key);
if (isBypassed(key)) {
return false;
}
if (ACTIVE.contains(key)) {
return true;
}
return FileStoreUtil.getInstance().existsBlockchainResyncMarker(key);
}
public static <T> T withBypass(String blockchainName, ThrowingSupplier<T> supplier) throws Exception {
SHiNE-server/src/main/java/server/sync/BlockchainResyncRecoveryOnStartup.java
+149
View File
@@ -0,0 +1,149 @@
package server.sync;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import shine.db.entities.SyncServerEntry;
import utils.files.FileStoreUtil;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Startup-recovery для цепочек, которые были помечены как resync-pending.
*
* Правило простое:
* - marker-file означает, что chain должен быть пересобран заново;
* - мы не пытаемся продолжать с середины;
* - если recovery не завершён, обычная работа сервера не стартует.
*/
public final class BlockchainResyncRecoveryOnStartup {
private static final Logger log = LoggerFactory.getLogger(BlockchainResyncRecoveryOnStartup.class);
private static final RemoteBlockchainSyncClient REMOTE = new RemoteBlockchainSyncClient();
private BlockchainResyncRecoveryOnStartup() {}
public static void runRecoveryOrThrow() {
Path dataDir = Paths.get(FileStoreUtil.DATA_DIR_NAME);
ensureDirExists(dataDir);
List<Path> markers = listMarkerFiles(dataDir);
if (markers.isEmpty()) {
log.info("🟢 BlockchainResyncRecovery: resync marker-файлы не найдены.");
return;
}
log.warn("🟡 BlockchainResyncRecovery: найдено marker-файлов: {}", markers.size());
for (Path marker : markers) {
recoverSingleMarkerOrThrow(marker);
}
log.info("✅ BlockchainResyncRecovery: все marker-файлы обработаны.");
}
private static void recoverSingleMarkerOrThrow(Path markerPath) {
String fileName = markerPath.getFileName().toString();
String blockchainName = extractBlockchainName(fileName);
if (blockchainName == null || blockchainName.isBlank()) {
throw new IllegalStateException("Bad resync marker name: " + fileName);
}
Map<String, String> meta = parseMarker(markerPath);
String partnerLogin = normalize(meta.get("partnerLogin"));
String partnerAddress = normalize(meta.get("partnerAddress"));
if (partnerAddress == null) {
throw new IllegalStateException("Resync marker has no partnerAddress for blockchainName=" + blockchainName);
}
log.warn("🔁 BlockchainResyncRecovery: processing marker blockchainName={} partnerLogin={} partnerAddress={}",
blockchainName, partnerLogin, partnerAddress);
try {
List<RemoteBlockchainSyncClient.RemoteBlockchainHead> heads = REMOTE.listBlockchainHeads(partnerAddress);
RemoteBlockchainSyncClient.RemoteBlockchainHead remoteHead = heads.stream()
.filter(h -> h != null && blockchainName.equals(h.blockchainName()))
.findFirst()
.orElseThrow(() -> new IllegalStateException(
"Partner does not expose blockchainName=" + blockchainName + " address=" + partnerAddress));
SyncServerEntry partner = new SyncServerEntry(
partnerLogin == null ? "" : partnerLogin,
partnerAddress,
System.currentTimeMillis()
);
PeriodicBlockchainSyncService.resyncFromScratch(partner, remoteHead);
} catch (Exception e) {
throw new IllegalStateException(
"Не удалось восстановить resync-помеченную цепочку blockchainName=" + blockchainName,
e
);
}
}
private static List<Path> listMarkerFiles(Path dataDir) {
try (DirectoryStream<Path> ds = Files.newDirectoryStream(dataDir, "*" + FileStoreUtil.BLOCKCHAIN_RESYNC_MARKER_EXTENSION)) {
return stream(ds).toList();
} catch (IOException e) {
throw new IllegalStateException("Cannot list resync markers in: " + dataDir, e);
}
}
private static java.util.stream.Stream<Path> stream(DirectoryStream<Path> ds) {
return java.util.stream.StreamSupport.stream(ds.spliterator(), false)
.filter(Files::isRegularFile);
}
private static Map<String, String> parseMarker(Path path) {
try {
List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);
Map<String, String> result = new HashMap<>();
for (String line : lines) {
if (line == null) continue;
String s = line.trim();
if (s.isEmpty() || s.startsWith("#")) continue;
int idx = s.indexOf('=');
if (idx <= 0) continue;
String key = s.substring(0, idx).trim();
String value = s.substring(idx + 1).trim();
result.put(key, value);
}
return result;
} catch (IOException e) {
throw new IllegalStateException("Cannot read resync marker: " + path, e);
}
}
private static void ensureDirExists(Path dir) {
try {
if (!Files.exists(dir)) {
Files.createDirectories(dir);
}
} catch (IOException e) {
throw new IllegalStateException("Cannot create data dir: " + dir, e);
}
}
private static String extractBlockchainName(String fileName) {
if (fileName == null) return null;
String s = fileName.trim();
if (!s.endsWith(FileStoreUtil.BLOCKCHAIN_RESYNC_MARKER_EXTENSION)) {
return null;
}
return s.substring(0, s.length() - FileStoreUtil.BLOCKCHAIN_RESYNC_MARKER_EXTENSION.length());
}
private static String normalize(String value) {
if (value == null) return null;
String s = value.trim();
return s.isEmpty() ? null : s.toLowerCase(Locale.ROOT);
}
}
SHiNE-server/src/main/java/server/sync/PeriodicBlockchainSyncService.java
+14 -12
View File
@@ -199,7 +199,7 @@ public final class PeriodicBlockchainSyncService {
partnerLogin, remoteHead.blockchainName(), fromBlockNumber, remoteHead.lastBlockNumber());
}
private static void resyncFromScratch(
static void resyncFromScratch(
SyncServerEntry partner,
RemoteBlockchainSyncClient.RemoteBlockchainHead remoteHead
) throws Exception {
@@ -237,6 +237,7 @@ public final class PeriodicBlockchainSyncService {
ReentrantLock chainLock = BlockchainLocks.lockFor(blockchainName);
chainLock.lock();
boolean success = false;
try {
BlockchainResyncCleanupDAO.CleanupResult cleanup =
RESYNC_CLEANUP_DAO.cleanupBlockchainForFullResync(blockchainName);
@@ -252,25 +253,26 @@ public final class PeriodicBlockchainSyncService {
FILE_STORE.deleteBlockchainTmpFileIfExists(blockchainName);
if (!ensureLocalChainExists(partner, blockchainName)) {
log.warn("Blockchain resync aborted: failed to recreate local chain state. partner={} blockchainName={}",
partnerLogin, blockchainName);
return;
throw new IllegalStateException("failed to recreate local chain state for " + blockchainName);
}
boolean replayOk = replayRemoteChainFromStart(partner, remoteHead);
if (replayOk) {
log.info("Blockchain resync completed: partner={} blockchainName={} blocks=0..{}",
partnerLogin, blockchainName, remoteHead.lastBlockNumber());
if (!replayOk) {
throw new IllegalStateException("failed to replay remote chain for " + blockchainName);
}
FILE_STORE.deleteBlockchainResyncMarkerIfExists(blockchainName);
success = true;
log.info("Blockchain resync completed: partner={} blockchainName={} blocks=0..{}",
partnerLogin, blockchainName, remoteHead.lastBlockNumber());
} finally {
try {
FILE_STORE.deleteBlockchainResyncMarkerIfExists(blockchainName);
} catch (Exception e) {
log.warn("Blockchain resync: failed to delete marker file blockchainName={}", blockchainName, e);
}
chainLock.unlock();
BlockchainResyncGuard.end(blockchainName);
}
if (!success) {
throw new IllegalStateException("Blockchain resync did not complete for " + blockchainName);
}
}
private static boolean replayRemoteChainFromStart(
SHiNE-server/src/main/java/server/ws/WsServer.java
+11
View File
@@ -6,6 +6,7 @@ import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerI
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import server.debug.DebugApiConfigurator;
import server.sync.BlockchainResyncRecoveryOnStartup;
import server.sync.PeriodicBlockchainSyncService;
import server.sync.SyncServersBootstrapService;
import utils.config.AppConfig;
@@ -38,6 +39,16 @@ public final class WsServer {
throw e; // останавливаем запуск
}
// ============================================================
// 0.1) Восстановление цепочек, зависших на full resync
// ============================================================
try {
BlockchainResyncRecoveryOnStartup.runRecoveryOrThrow();
} catch (Exception e) {
log.error("❌ Сервер НЕ будет запущен: критическая ошибка восстановления blockchain resync-маркеров.", e);
throw e;
}
// ============================================================
// 1) Настройки порта
// ============================================================