Fix metarange and range cache params mixup, and boost caches sizes (treeverse#1285)

arielshaqed · web-flow · commit 90c98d59cd7b · 2021-01-21T22:51:54.000+02:00
Was mixing them up, and they're really rather small.
diff --git a/catalog/rocks/entry_catalog.go b/catalog/rocks/entry_catalog.go
@@ -111,12 +111,12 @@ func NewEntryCatalog(cfg *config.Config, db db.Database) (*EntryCatalog, error)
 
 	pebbleSSTableCache := pebble.NewCache(tierFSParams.PebbleSSTableCacheSizeBytes)
 	defer pebbleSSTableCache.Unref()
-	metaRangeCache := sstable.NewCache(*cfg.GetCommittedRangeSSTableCacheParams(),
-		metaRangeFS,
-		pebblesst.ReaderOptions{Cache: pebbleSSTableCache})
-	rangeCache := sstable.NewCache(*cfg.GetCommittedMetaRangeSSTableCacheParams(),
+	rangeCache := sstable.NewCache(*cfg.GetCommittedRangeSSTableCacheParams(),
 		rangeFS,
 		pebblesst.ReaderOptions{Cache: pebbleSSTableCache})
+	metaRangeCache := sstable.NewCache(*cfg.GetCommittedMetaRangeSSTableCacheParams(),
+		metaRangeFS,
+		pebblesst.ReaderOptions{Cache: pebbleSSTableCache})
 
 	sstableManager := sstable.NewPebbleSSTableRangeManager(rangeCache, rangeFS, hashAlg)
 	sstableMetaManager := sstable.NewPebbleSSTableRangeManager(metaRangeCache, metaRangeFS, hashAlg)
diff --git a/config/config.go b/config/config.go
@@ -38,10 +38,10 @@ const (
 	DefaultCommittedLocalCacheMetaRangePercent      = 0.1
 	DefaultCommittedLocalCacheBytes                 = 1 * 1024 * 1024 * 1024
 	DefaultCommittedLocalCacheDir                   = "~/lakefs/local_tier"
-	DefaultCommittedMetaRangeReaderCacheSize        = 20
-	DefaultCommittedMetaRangeReaderNumShards        = 6
-	DefaultCommittedRangeReaderCacheSize            = 100
-	DefaultCommittedRangeReaderNumShards            = 12
+	DefaultCommittedMetaRangeReaderCacheSize        = 50
+	DefaultCommittedMetaRangeReaderNumShards        = 10
+	DefaultCommittedRangeReaderCacheSize            = 500
+	DefaultCommittedRangeReaderNumShards            = 30
 	DefaultCommittedPebbleSSTableCacheSizeBytes     = 200_000_000
 	DefaultCommittedBlockStoragePrefix              = "_lakefs"
 	DefaultCommittedPermanentMinRangeSizeBytes      = 0
