Merge branch 'rocksdb-log-size-fix' into release-3.1

lni · Sep 7, 2019 · 988668b · 988668b
2 parents cb7543d + bf49d3c
commit 988668b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/internal/logdb/kv/rocksdb/kv_rocksdb.go b/internal/logdb/kv/rocksdb/kv_rocksdb.go
@@ -33,6 +33,7 @@ var (
 	logDBLRUCacheSize        = int(settings.Soft.RDBLRUCacheSize)
 	maxBackgroundCompactions = int(settings.Soft.RDBMaxBackgroundCompactions)
 	maxBackgroundFlushes     = int(settings.Soft.RDBMaxBackgroundFlushes)
+	keepLogFileNum           = int(settings.Soft.RDBKeepLogFileNum)
 )
 
 // NewKVStore returns a RocksDB based IKVStore instance.
@@ -73,6 +74,8 @@ func getRocksDBOptions(directory string,
 	}
 	opts := gorocksdb.NewDefaultOptions()
 	opts.SetMaxManifestFileSize(1024 * 1024 * 128)
+	opts.SetMaxLogFileSize(1024 * 1024 * 128)
+	opts.SetKeepLogFileNum(keepLogFileNum)
 	opts.SetBlockBasedTableFactory(bbto)
 	opts.SetCreateIfMissing(true)
 	opts.SetUseFsync(true)

diff --git a/internal/settings/soft.go b/internal/settings/soft.go
@@ -198,7 +198,8 @@ type soft struct {
 	//
 	// LogDB
 	//
-
+	// RDBKeepLogFileNum defines how many log files to keep.
+	RDBKeepLogFileNum uint64
 	// RDBMaxBackgroundCompactions is the MaxBackgroundCompactions parameter
 	// directly passed to rocksdb.
 	RDBMaxBackgroundCompactions uint64
@@ -260,5 +261,6 @@ func getDefaultSoftSettings() soft {
 		RDBMaxBackgroundCompactions:    2,
 		RDBMaxBackgroundFlushes:        2,
 		RDBLRUCacheSize:                0,
+		RDBKeepLogFileNum:              16,
 	}
 }