Skip to content

Commit 0757279

Browse files
authored
refactor(db): remove function for periodic backup of RocksDB database (#6724)
1 parent 4f41f26 commit 0757279

20 files changed

Lines changed: 3 additions & 880 deletions

File tree

common/src/main/java/org/tron/common/config/DbBackupConfig.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

common/src/main/java/org/tron/common/parameter/CommonParameter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import lombok.Setter;
1010
import org.slf4j.bridge.SLF4JBridgeHandler;
1111
import org.tron.common.args.GenesisBlock;
12-
import org.tron.common.config.DbBackupConfig;
1312
import org.tron.common.cron.CronExpression;
1413
import org.tron.common.logsfilter.EventPluginConfig;
1514
import org.tron.common.logsfilter.FilterQuery;
@@ -425,8 +424,6 @@ public class CommonParameter {
425424
@Setter
426425
public double rateLimiterDisconnect; // clearParam: 1.0
427426
@Getter
428-
public DbBackupConfig dbBackupConfig;
429-
@Getter
430427
public RocksDbSettings rocksDBCustomSettings;
431428
@Getter
432429
public GenesisBlock genesisBlock;

common/src/main/java/org/tron/core/config/args/StorageConfig.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public class StorageConfig {
2525
private TransHistoryConfig transHistory = new TransHistoryConfig();
2626
private boolean needToUpdateAsset = true;
2727
private DbSettingsConfig dbSettings = new DbSettingsConfig();
28-
private BackupConfig backup = new BackupConfig();
2928
private BalanceConfig balance = new BalanceConfig();
3029
private CheckpointConfig checkpoint = new CheckpointConfig();
3130
private SnapshotConfig snapshot = new SnapshotConfig();
@@ -129,16 +128,6 @@ void postProcess() {
129128
}
130129
}
131130

132-
@Getter
133-
@Setter
134-
public static class BackupConfig {
135-
private boolean enable = false;
136-
private String propPath = "prop.properties";
137-
private String bak1path = "bak1/database/";
138-
private String bak2path = "bak2/database/";
139-
private int frequency = 10000;
140-
}
141-
142131
@Getter
143132
@Setter
144133
public static class BalanceConfig {

common/src/main/resources/reference.conf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,6 @@ storage {
120120
# Number of blocks flushed to db in each batch during node syncing.
121121
snapshot.maxFlushCount = 1
122122

123-
# Database backup settings (RocksDB only)
124-
backup = {
125-
enable = false
126-
propPath = "prop.properties"
127-
bak1path = "bak1/database/"
128-
bak2path = "bak2/database/"
129-
frequency = 10000
130-
}
131-
132123
# Data root setting, for check data, currently only reward-vi is used.
133124
# merkleRoot = {
134125
# reward-vi = 9debcb9924055500aaae98cdee10501c5c39d4daa75800a996f4bdda73dbccd8 // main-net

common/src/test/java/org/tron/core/config/args/StorageConfigTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public void testDefaults() {
2828
assertEquals("database", sc.getDb().getDirectory());
2929
assertEquals("index", sc.getIndex().getDirectory());
3030
assertTrue(sc.isNeedToUpdateAsset());
31-
assertFalse(sc.getBackup().isEnable());
32-
assertEquals(10000, sc.getBackup().getFrequency());
3331
assertEquals(7, sc.getDbSettings().getLevelNumber());
3432
assertEquals(5000, sc.getDbSettings().getMaxOpenFiles());
3533
}
@@ -44,8 +42,6 @@ public void testFromConfig() {
4442
assertEquals("ROCKSDB", sc.getDb().getEngine());
4543
assertTrue(sc.getDb().isSync());
4644
assertEquals("mydb", sc.getDb().getDirectory());
47-
assertTrue(sc.getBackup().isEnable());
48-
assertEquals(5000, sc.getBackup().getFrequency());
4945
assertEquals(5, sc.getDbSettings().getLevelNumber());
5046
assertEquals(3000, sc.getDbSettings().getMaxOpenFiles());
5147
}

framework/Daily_Build_Report

Lines changed: 0 additions & 1 deletion
This file was deleted.

framework/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ def configureTestTask = { Task t ->
114114
}
115115
if (isWindows()) {
116116
t.exclude '**/ShieldedTransferActuatorTest.class'
117-
t.exclude '**/BackupDbUtilTest.class'
118117
t.exclude '**/ManagerTest.class'
119118
t.exclude 'org/tron/core/zksnark/**'
120119
t.exclude 'org/tron/common/runtime/vm/PrecompiledContractsVerifyProofTest.class'
@@ -161,7 +160,6 @@ tasks.register('testWithRocksDb', Test) {
161160
include 'org/tron/core/config/args/ArgsTest.class'
162161
include 'org/tron/core/db/DBIteratorTest.class'
163162
include 'org/tron/core/db/TronDatabaseTest.class'
164-
include 'org/tron/core/db/backup/BackupDbUtilTest.class'
165163
include 'org/tron/core/db2/ChainbaseTest.class'
166164
exclude '**/LevelDbDataSourceImplTest.class'
167165
}

framework/prop.properties

Whitespace-only changes.

framework/src/main/java/org/tron/core/config/DefaultConfig.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.context.ApplicationContext;
77
import org.springframework.context.annotation.Bean;
8-
import org.springframework.context.annotation.Conditional;
98
import org.springframework.context.annotation.Configuration;
109
import org.springframework.context.annotation.Import;
1110
import org.tron.common.utils.StorageUtils;
1211
import org.tron.core.config.args.Args;
1312
import org.tron.core.db.RevokingDatabase;
14-
import org.tron.core.db.backup.BackupRocksDBAspect;
15-
import org.tron.core.db.backup.NeedBeanCondition;
1613
import org.tron.core.db2.core.SnapshotManager;
1714
import org.tron.core.services.interfaceOnPBFT.RpcApiServiceOnPBFT;
1815
import org.tron.core.services.interfaceOnPBFT.http.PBFT.HttpApiOnPBFTService;
@@ -88,9 +85,4 @@ public HttpApiOnPBFTService getHttpApiOnPBFTService() {
8885
return null;
8986
}
9087

91-
@Bean
92-
@Conditional(NeedBeanCondition.class)
93-
public BackupRocksDBAspect backupRocksDBAspect() {
94-
return new BackupRocksDBAspect();
95-
}
9688
}

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.tron.common.args.Account;
4040
import org.tron.common.args.GenesisBlock;
4141
import org.tron.common.args.Witness;
42-
import org.tron.common.config.DbBackupConfig;
4342
import org.tron.common.cron.CronExpression;
4443
import org.tron.common.logsfilter.EventPluginConfig;
4544
import org.tron.common.logsfilter.FilterQuery;
@@ -225,12 +224,6 @@ private static void applyStorageConfig(StorageConfig sc) {
225224
PARAMETER.storage.setTxCacheInitOptimization(sc.getTxCache().isInitOptimization());
226225
PARAMETER.storage.setMaxFlushCount(sc.getSnapshot().getMaxFlushCount());
227226

228-
// backup
229-
StorageConfig.BackupConfig backup = sc.getBackup();
230-
PARAMETER.dbBackupConfig = DbBackupConfig.getInstance()
231-
.initArgs(backup.isEnable(), backup.getPropPath(),
232-
backup.getBak1path(), backup.getBak2path(), backup.getFrequency());
233-
234227
// RocksDB settings
235228
StorageConfig.DbSettingsConfig dbs = sc.getDbSettings();
236229
PARAMETER.rocksDBCustomSettings = RocksDbSettings

0 commit comments

Comments
 (0)