diff --git a/framework/src/main/java/org/tron/tool/litefullnode/LiteFullNodeTool.java b/framework/src/main/java/org/tron/tool/litefullnode/LiteFullNodeTool.java
index 037760e201a..db5dff884e2 100644
--- a/framework/src/main/java/org/tron/tool/litefullnode/LiteFullNodeTool.java
+++ b/framework/src/main/java/org/tron/tool/litefullnode/LiteFullNodeTool.java
@@ -4,6 +4,7 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.beust.jcommander.internal.Lists;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.common.primitives.Bytes;
@@ -16,9 +17,9 @@
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
+import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Optional;
-import java.util.stream.LongStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.rocksdb.RocksDBException;
@@ -47,50 +48,23 @@ public class LiteFullNodeTool {
private static final String INFO_FILE_NAME = "info.properties";
private static final String BACKUP_DIR_PREFIX = ".bak_";
private static final String CHECKPOINT_DB = "tmp";
- private static final long VM_NEED_RECENT_BLKS = 256;
+ private static long RECENT_BLKS = 65536;
private static final String BLOCK_DB_NAME = "block";
private static final String BLOCK_INDEX_DB_NAME = "block-index";
- private static final String TRANS_CACHE_DB_NAME = "trans-cache";
+ private static final String TRANS_DB_NAME = "trans";
private static final String COMMON_DB_NAME = "common";
+ private static final String TRANSACTION_RET_DB_NAME = "transactionRetStore";
+ private static final String TRANSACTION_HISTORY_DB_NAME = "transactionHistoryStore";
private static final String DIR_FORMAT_STRING = "%s%s%s";
private static List<String> archiveDbs = Arrays.asList(
BLOCK_DB_NAME,
BLOCK_INDEX_DB_NAME,
- "trans",
- "transactionRetStore",
- "transactionHistoryStore");
- private static List<String> minimumDbsForLiteNode = Arrays.asList(
- "DelegatedResource",
- "DelegatedResourceAccountIndex",
- "IncrementalMerkleTree",
- "account",
- "account-index",
- "accountTrie",
- "accountid-index",
- "asset-issue",
- "asset-issue-v2",
- //"block_KDB",
- "code",
- //"common",
- "contract",
- "delegation",
- "exchange",
- "exchange-v2",
- //"nullifier",
- "properties",
- "proposal",
- "recent-block",
- //"recent-transaction",
- "storage-row",
- //TRANS_CACHE_DB_NAME,
- //"tree-block-index",
- "votes",
- "witness",
- "witness_schedule"
- );
+ TRANS_DB_NAME,
+ TRANSACTION_RET_DB_NAME,
+ TRANSACTION_HISTORY_DB_NAME);
/**
* Create the snapshot dataset.
@@ -104,13 +78,12 @@ public void generateSnapshot(String sourceDir, String snapshotDir) {
long start = System.currentTimeMillis();
snapshotDir = Paths.get(snapshotDir, SNAPSHOT_DIR_NAME).toString();
try {
+ hasEnoughBlock(sourceDir);
List<String> snapshotDbs = getSnapshotDbs(sourceDir);
split(sourceDir, snapshotDir, snapshotDbs);
mergeCheckpoint2Snapshot(sourceDir, snapshotDir);
- // write genesisBlock and latestBlock
- fillSnapshotBlockDb(sourceDir, snapshotDir);
- // create tran-cache if not exist, for compatible
- checkTranCacheStore(sourceDir, snapshotDir);
+ // write genesisBlock , latest recent blocks and trans
+ fillSnapshotBlockAndTransDb(sourceDir, snapshotDir);
generateInfoProperties(Paths.get(snapshotDir, INFO_FILE_NAME).toString(), sourceDir);
} catch (IOException | RocksDBException e) {
logger.error("create snapshot failed, " + e.getMessage());
@@ -132,6 +105,11 @@ public void generateHistory(String sourceDir, String historyDir) {
long start = System.currentTimeMillis();
historyDir = Paths.get(historyDir, HISTORY_DIR_NAME).toString();
try {
+ if (isLite(sourceDir)) {
+ throw new IllegalStateException(
+ String.format("Unavailable sourceDir: %s is not fullNode data.", sourceDir));
+ }
+ hasEnoughBlock(sourceDir);
split(sourceDir, historyDir, archiveDbs);
mergeCheckpoint2History(sourceDir, historyDir);
generateInfoProperties(Paths.get(historyDir, INFO_FILE_NAME).toString(), sourceDir);
@@ -155,6 +133,12 @@ public void completeHistoryData(String historyDir, String databaseDir) {
long start = System.currentTimeMillis();
BlockNumInfo blockNumInfo = null;
try {
+ // check historyDir is from lite data
+ if (isLite(historyDir)) {
+ throw new IllegalStateException(
+ String.format("Unavailable history: %s is not generated by fullNode data.",
+ historyDir));
+ }
// 1. check block number and genesis block are compatible,
// and return the block numbers of snapshot and history
blockNumInfo = checkAndGetBlockNumInfo(historyDir, databaseDir);
@@ -183,11 +167,6 @@ private List<String> getSnapshotDbs(String sourceDir) {
.filter(File::isDirectory)
.filter(dir -> !archiveDbs.contains(dir.getName()))
.forEach(dir -> snapshotDbs.add(dir.getName()));
- for (String dir : minimumDbsForLiteNode) {
- if (!snapshotDbs.contains(dir)) {
- throw new RuntimeException("databaseDir does not contain all the necessary databases");
- }
- }
return snapshotDbs;
}
@@ -270,16 +249,16 @@ private long getLatestBlockHeaderNum(String databaseDir) throws IOException, Roc
}
/**
- * Syncing block from peer that needs latest block and genesis block,
- * also VM need recent blocks.
+ * recent blocks, trans and genesis block.
*/
- private void fillSnapshotBlockDb(String sourceDir, String snapshotDir)
+ private void fillSnapshotBlockAndTransDb(String sourceDir, String snapshotDir)
throws IOException, RocksDBException {
- logger.info("-- begin to fill latest block and genesis block to snapshot");
+ logger.info("-- begin to fill {} block , genesis block and trans to snapshot", RECENT_BLKS);
DBInterface sourceBlockIndexDb = DbTool.getDB(sourceDir, BLOCK_INDEX_DB_NAME);
DBInterface sourceBlockDb = DbTool.getDB(sourceDir, BLOCK_DB_NAME);
DBInterface destBlockDb = DbTool.getDB(snapshotDir, BLOCK_DB_NAME);
DBInterface destBlockIndexDb = DbTool.getDB(snapshotDir, BLOCK_INDEX_DB_NAME);
+ DBInterface destTransDb = DbTool.getDB(snapshotDir, TRANS_DB_NAME);
// put genesis block and block-index into snapshot
long genesisBlockNum = 0L;
byte[] genesisBlockID = sourceBlockIndexDb.get(ByteArray.fromLong(genesisBlockNum));
@@ -287,71 +266,33 @@ private void fillSnapshotBlockDb(String sourceDir, String snapshotDir)
destBlockDb.put(genesisBlockID, sourceBlockDb.get(genesisBlockID));
long latestBlockNum = getLatestBlockHeaderNum(sourceDir);
- long startIndex = latestBlockNum > VM_NEED_RECENT_BLKS
- ? latestBlockNum - VM_NEED_RECENT_BLKS : 0;
- // put the recent blocks in snapshot, VM needs recent 256 blocks.
- LongStream.rangeClosed(startIndex, latestBlockNum).forEach(
- blockNum -> {
- byte[] blockId = null;
- byte[] block = null;
- try {
- blockId = getDataFromSourceDB(sourceDir, BLOCK_INDEX_DB_NAME,
- Longs.toByteArray(blockNum));
- block = getDataFromSourceDB(sourceDir, BLOCK_DB_NAME, blockId);
- } catch (IOException | RocksDBException e) {
- throw new RuntimeException(e.getMessage());
- }
- // put recent blocks index into snapshot
- destBlockIndexDb.put(ByteArray.fromLong(blockNum), blockId);
- // put latest blocks into snapshot
- destBlockDb.put(blockId, block);
- });
+ long startIndex = latestBlockNum - RECENT_BLKS + 1;
+ // put the recent blocks and trans in snapshot
+ for (long blockNum = startIndex; blockNum <= latestBlockNum; blockNum++) {
+ try {
+ byte[] blockId = getDataFromSourceDB(sourceDir, BLOCK_INDEX_DB_NAME,
+ Longs.toByteArray(blockNum));
+ byte[] block = getDataFromSourceDB(sourceDir, BLOCK_DB_NAME, blockId);
+ // put block
+ destBlockDb.put(blockId, block);
+ // put block index
+ destBlockIndexDb.put(ByteArray.fromLong(blockNum), blockId);
+ // put trans
+ long finalBlockNum = blockNum;
+ new BlockCapsule(block).getTransactions().stream().map(
+ tc -> tc.getTransactionId().getBytes())
+ .map(bytes -> Maps.immutableEntry(bytes, Longs.toByteArray(finalBlockNum)))
+ .forEach(e -> destTransDb.put(e.getKey(), e.getValue()));
+ } catch (IOException | RocksDBException | BadItemException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
DBInterface destCommonDb = DbTool.getDB(snapshotDir, COMMON_DB_NAME);
destCommonDb.put(DB_KEY_NODE_TYPE, ByteArray.fromInt(Constant.NODE_TYPE_LIGHT_NODE));
destCommonDb.put(DB_KEY_LOWEST_BLOCK_NUM, ByteArray.fromLong(startIndex));
}
- private void checkTranCacheStore(String sourceDir, String snapshotDir)
- throws IOException, RocksDBException {
- logger.info("-- create trans-cache db if not exists.");
- if (FileUtil.isExists(String.format(DIR_FORMAT_STRING, snapshotDir,
- File.separator, TRANS_CACHE_DB_NAME))) {
- return;
- }
- // fullnode is old version, create trans-cache database
- DBInterface recentBlockDb = DbTool.getDB(snapshotDir, "recent-block");
- DBInterface transCacheDb = DbTool.getDB(snapshotDir, TRANS_CACHE_DB_NAME);
- long headNum = getLatestBlockHeaderNum(sourceDir);
- long recentBlockCount = recentBlockDb.size();
-
- LongStream.rangeClosed(headNum - recentBlockCount + 1, headNum).forEach(
- blockNum -> {
- byte[] blockId = null;
- byte[] block = null;
- try {
- blockId = getDataFromSourceDB(sourceDir, BLOCK_INDEX_DB_NAME,
- Longs.toByteArray(blockNum));
- block = getDataFromSourceDB(sourceDir, BLOCK_DB_NAME, blockId);
- } catch (IOException | RocksDBException e) {
- throw new RuntimeException(e.getMessage());
- }
- BlockCapsule blockCapsule = null;
- try {
- blockCapsule = new BlockCapsule(block);
- } catch (BadItemException e) {
- throw new RuntimeException("construct block failed, num: " + blockNum);
- }
- if (blockCapsule.getTransactions().isEmpty()) {
- return;
- }
- blockCapsule.getTransactions().stream()
- .map(tc -> tc.getTransactionId().getBytes())
- .map(bytes -> Maps.immutableEntry(bytes, Longs.toByteArray(blockNum)))
- .forEach(e -> transCacheDb.put(e.getKey(), e.getValue()));
- });
- }
-
private byte[] getGenesisBlockHash(String parentDir) throws IOException, RocksDBException {
long genesisBlockNum = 0L;
DBInterface blockIndexDb = DbTool.getDB(parentDir, BLOCK_INDEX_DB_NAME);
@@ -424,8 +365,8 @@ private void trimHistory(String databaseDir, BlockNumInfo blockNumInfo)
logger.info("-- begin to trim the history data.");
DBInterface blockIndexDb = DbTool.getDB(databaseDir, BLOCK_INDEX_DB_NAME);
DBInterface blockDb = DbTool.getDB(databaseDir, BLOCK_DB_NAME);
- DBInterface transDb = DbTool.getDB(databaseDir, "trans");
- DBInterface tranRetDb = DbTool.getDB(databaseDir, "transactionRetStore");
+ DBInterface transDb = DbTool.getDB(databaseDir, TRANS_DB_NAME);
+ DBInterface tranRetDb = DbTool.getDB(databaseDir, TRANSACTION_RET_DB_NAME);
for (long n = blockNumInfo.getHistoryBlkNum(); n > blockNumInfo.getSnapshotBlkNum(); n--) {
byte[] blockIdHash = blockIndexDb.get(ByteArray.fromLong(n));
BlockCapsule block = new BlockCapsule(blockDb.get(blockIdHash));
@@ -460,12 +401,15 @@ private void mergeBak2Database(String databaseDir) throws IOException, RocksDBEx
private byte[] getDataFromSourceDB(String sourceDir, String dbName, byte[] key)
throws IOException, RocksDBException {
DBInterface sourceDb = DbTool.getDB(sourceDir, dbName);
- DBInterface checkpointDb = DbTool.getDB(sourceDir, "tmp");
- byte[] value = sourceDb.get(key);
- if (isEmptyBytes(value)) {
- byte[] valueFromTmp = checkpointDb.get(Bytes.concat(simpleEncode(dbName), key));
+ DBInterface checkpointDb = DbTool.getDB(sourceDir, CHECKPOINT_DB);
+ // get data from tmp first.
+ byte[] valueFromTmp = checkpointDb.get(Bytes.concat(simpleEncode(dbName), key));
+ byte[] value;
+ if (isEmptyBytes(valueFromTmp)) {
+ value = sourceDb.get(key);
+ } else {
value = valueFromTmp.length == 1
- ? null : Arrays.copyOfRange(valueFromTmp, 1, valueFromTmp.length);
+ ? null : Arrays.copyOfRange(valueFromTmp, 1, valueFromTmp.length);
}
if (isEmptyBytes(value)) {
throw new RuntimeException(String.format("data not found in store, dbName: %s, key: %s",
@@ -489,8 +433,7 @@ private static boolean isEmptyBytes(byte[] b) {
private void deleteSnapshotFlag(String databaseDir) throws IOException, RocksDBException {
logger.info("-- delete the info file.");
Files.delete(Paths.get(databaseDir, INFO_FILE_NAME));
- DBInterface destBlockIndexDb = DbTool.getDB(databaseDir, BLOCK_INDEX_DB_NAME);
- if (destBlockIndexDb.get(ByteArray.fromLong(1)) != null) {
+ if (!isLite(databaseDir)) {
DBInterface destCommonDb = DbTool.getDB(databaseDir, COMMON_DB_NAME);
destCommonDb.delete(DB_KEY_NODE_TYPE);
destCommonDb.delete(DB_KEY_LOWEST_BLOCK_NUM);
@@ -500,6 +443,53 @@ private void deleteSnapshotFlag(String databaseDir) throws IOException, RocksDBE
}
+ private void hasEnoughBlock(String sourceDir) throws RocksDBException, IOException {
+ // check latest
+ long latest = getLatestBlockHeaderNum(sourceDir);
+ // check first, not 0;
+ long first = 0;
+ DBInterface sourceBlockIndexDb = DbTool.getDB(sourceDir, BLOCK_INDEX_DB_NAME);
+ DBIterator iterator = sourceBlockIndexDb.iterator();
+ iterator.seekToFirst();
+ if (iterator.hasNext()) {
+ iterator.next();
+ if (iterator.hasNext()) {
+ first = Longs.fromByteArray(iterator.getKey());
+ }
+ }
+
+ if (latest - first + 1 < RECENT_BLKS) {
+ throw new NoSuchElementException(
+ String.format("At least %d blocks in block store, actual latestBlock:%d, firstBlock:%d.",
+ RECENT_BLKS, latest, first));
+ }
+ }
+
+ private boolean isLite(String databaseDir) throws RocksDBException, IOException {
+ DBInterface sourceDb = DbTool.getDB(databaseDir, BLOCK_INDEX_DB_NAME);
+ DBInterface checkpointDb = DbTool.getDB(databaseDir, CHECKPOINT_DB);
+ byte[] key = ByteArray.fromLong(1);
+ byte[] valueFromTmp = checkpointDb.get(Bytes.concat(simpleEncode(BLOCK_INDEX_DB_NAME), key));
+ byte[] value;
+ if (isEmptyBytes(valueFromTmp)) {
+ value = sourceDb.get(key);
+ } else {
+ value = valueFromTmp.length == 1
+ ? null : Arrays.copyOfRange(valueFromTmp, 1, valueFromTmp.length);
+ }
+ return isEmptyBytes(value);
+ }
+
+ @VisibleForTesting
+ public static void setRecentBlks(long recentBlks) {
+ RECENT_BLKS = recentBlks;
+ }
+
+ @VisibleForTesting
+ public static void reSetRecentBlks() {
+ RECENT_BLKS = 65536;
+ }
+
private void run(Args argv) {
if (StringUtils.isBlank(argv.fnDataPath) || StringUtils.isBlank(argv.datasetPath)) {
throw new ParameterException("fnDataPath or datasetPath can't be null");
diff --git a/framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java b/framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java
index 174c708a7c7..2ead3c52713 100644
--- a/framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java
+++ b/framework/src/test/java/org/tron/program/LiteFullNodeToolTest.java
@@ -6,15 +6,15 @@
import java.io.File;
import java.math.BigInteger;
import java.nio.file.Paths;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.tron.api.DatabaseGrpc;
import org.tron.api.GrpcAPI;
import org.tron.api.WalletGrpc;
-import org.tron.api.WalletSolidityGrpc;
import org.tron.common.application.Application;
import org.tron.common.application.ApplicationFactory;
import org.tron.common.application.TronApplicationContext;
@@ -37,12 +37,7 @@ public class LiteFullNodeToolTest {
private static final Logger logger = LoggerFactory.getLogger("Test");
private TronApplicationContext context;
- private ManagedChannel channelFull = null;
private WalletGrpc.WalletBlockingStub blockingStubFull = null;
- private WalletSolidityGrpc.WalletSolidityBlockingStub blockingStubSolidity = null;
- private DatabaseGrpc.DatabaseBlockingStub databaseBlockingStub = null;
- private RpcApiService rpcApiService;
- private RpcApiServiceOnSolidity rpcApiServiceOnSolidity;
private Application appTest;
private String databaseDir;
@@ -50,38 +45,40 @@ public class LiteFullNodeToolTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
+
+ private static final String DB_PATH = "output_lite_fn";
+
/**
* init logic.
*/
public void startApp() {
context = new TronApplicationContext(DefaultConfig.class);
appTest = ApplicationFactory.create(context);
- rpcApiService = context.getBean(RpcApiService.class);
- rpcApiServiceOnSolidity = context.getBean(RpcApiServiceOnSolidity.class);
- appTest.addService(rpcApiService);
- appTest.addService(rpcApiServiceOnSolidity);
+ appTest.addService(context.getBean(RpcApiService.class));
+ appTest.addService(context.getBean(RpcApiServiceOnSolidity.class));
appTest.initServices(Args.getInstance());
appTest.startServices();
appTest.startup();
String fullnode = String.format("%s:%d", "127.0.0.1",
Args.getInstance().getRpcPort());
- channelFull = ManagedChannelBuilder.forTarget(fullnode)
+ ManagedChannel channelFull = ManagedChannelBuilder.forTarget(fullnode)
.usePlaintext(true)
.build();
blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
- blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelFull);
- databaseBlockingStub = DatabaseGrpc.newBlockingStub(channelFull);
}
/**
* Delete the database when exit.
*/
- public static void destory(String dbPath) {
- if (FileUtil.deleteDir(new File(dbPath))) {
- logger.info("Release resources successful.");
- } else {
- logger.info("Release resources failure.");
+ public static void destroy(String dbPath) {
+ File f = new File(dbPath);
+ if (f.exists()) {
+ if (FileUtil.deleteDir(new File(dbPath))) {
+ logger.info("Release resources successful.");
+ } else {
+ logger.info("Release resources failure.");
+ }
}
}
@@ -94,84 +91,94 @@ public void shutdown() {
context.destroy();
}
- @Test
- public void testToolsWithLevelDB() {
- String dbPath = "output_lite_fn_leveldb_test";
- Args.setParam(new String[]{"-d", dbPath, "-w"}, "config-localtest.conf");
+ @Before
+ public void init() {
+ destroy(DB_PATH); // delete if prev failed
+ Args.setParam(new String[]{"-d", DB_PATH, "-w"}, "config-localtest.conf");
// allow account root
Args.getInstance().setAllowAccountStateRoot(1);
databaseDir = Args.getInstance().getStorage().getDbDirectory();
- testTools("LEVELDB", dbPath);
- destory(dbPath);
+ // init dbBackupConfig to avoid NPE
+ Args.getInstance().dbBackupConfig = DbBackupConfig.getInstance();
+ }
+
+ @After
+ public void clear() {
+ destroy(DB_PATH);
+ Args.clearParam();
+ }
+
+ @Test
+ public void testToolsWithLevelDB() {
+ logger.info("testToolsWithLevelDB start");
+ testTools("LEVELDB");
+
}
@Test
public void testToolsWithRocksDB() {
- String dbPath = "output_lite_fn_rocksdb_test";
- Args.setParam(new String[]{"-d", dbPath, "-w"}, "config-localtest.conf");
- // allow account root
- Args.getInstance().setAllowAccountStateRoot(1);
- databaseDir = Args.getInstance().getStorage().getDbDirectory();
- // init dbBackupConfig to avoid NPE
- Args.getInstance().dbBackupConfig = DbBackupConfig.getInstance();
- testTools("ROCKSDB", dbPath);
- destory(dbPath);
+ logger.info("testToolsWithRocksDB start");
+ testTools("ROCKSDB");
}
- private void testTools(String dbType, String dbPath) {
+ private void testTools(String dbType) {
final String[] argsForSnapshot =
new String[]{"-o", "split", "-t", "snapshot", "--fn-data-path",
- dbPath + File.separator + databaseDir, "--dataset-path", dbPath};
+ DB_PATH + File.separator + databaseDir, "--dataset-path",
+ DB_PATH};
final String[] argsForHistory =
new String[]{"-o", "split", "-t", "history", "--fn-data-path",
- dbPath + File.separator + databaseDir, "--dataset-path", dbPath};
+ DB_PATH + File.separator + databaseDir, "--dataset-path",
+ DB_PATH};
final String[] argsForMerge =
- new String[]{"-o", "merge", "--fn-data-path", dbPath + File.separator + databaseDir,
- "--dataset-path", dbPath + File.separator + "history"};
+ new String[]{"-o", "merge", "--fn-data-path", DB_PATH + File.separator + databaseDir,
+ "--dataset-path", DB_PATH + File.separator + "history"};
Args.getInstance().getStorage().setDbEngine(dbType);
+ LiteFullNodeTool.setRecentBlks(3);
// start fullnode
startApp();
- // produce transactions for 10 seconds
- generateSomeTransactions(10);
+ // produce transactions for 18 seconds
+ generateSomeTransactions(18);
// stop the node
shutdown();
// delete tran-cache
- FileUtil.deleteDir(Paths.get(dbPath, databaseDir, "trans-cache").toFile());
+ FileUtil.deleteDir(Paths.get(DB_PATH, databaseDir, "trans-cache").toFile());
// generate snapshot
LiteFullNodeTool.main(argsForSnapshot);
// start fullnode
startApp();
- // produce transactions for 10 seconds
- generateSomeTransactions(4);
+ // produce transactions for 6 seconds
+ generateSomeTransactions(6);
// stop the node
shutdown();
// generate history
LiteFullNodeTool.main(argsForHistory);
// backup original database to database_bak
- File database = new File(Paths.get(dbPath, databaseDir).toString());
- if (!database.renameTo(new File(Paths.get(dbPath, databaseDir + "_bak").toString()))) {
+ File database = new File(Paths.get(DB_PATH, databaseDir).toString());
+ if (!database.renameTo(new File(Paths.get(DB_PATH, databaseDir + "_bak").toString()))) {
throw new RuntimeException(
String.format("rename %s to %s failed", database.getPath(),
- Paths.get(dbPath, databaseDir).toString()));
+ Paths.get(DB_PATH, databaseDir).toString()));
}
// change snapshot to the new database
- File snapshot = new File(Paths.get(dbPath, "snapshot").toString());
- if (!snapshot.renameTo(new File(Paths.get(dbPath, databaseDir).toString()))) {
+ File snapshot = new File(Paths.get(DB_PATH, "snapshot").toString());
+ if (!snapshot.renameTo(new File(Paths.get(DB_PATH, databaseDir).toString()))) {
throw new RuntimeException(
String.format("rename snapshot to %s failed",
- Paths.get(dbPath, databaseDir).toString()));
+ Paths.get(DB_PATH, databaseDir).toString()));
}
// start and validate the snapshot
startApp();
- generateSomeTransactions(4);
+ generateSomeTransactions(6);
// stop the node
shutdown();
// merge history
LiteFullNodeTool.main(argsForMerge);
// start and validate
startApp();
- generateSomeTransactions(4);
+ generateSomeTransactions(6);
shutdown();
+ LiteFullNodeTool.reSetRecentBlks();
}
private void generateSomeTransactions(int during) {