config: make BlockKeyCacheSize an OptionalInteger

config/datastore.go

@@ -4,8 +4,14 @@ import (
 	"encoding/json"
 )
 
-// DefaultDataStoreDirectory is the directory to store all the local IPFS data.
-const DefaultDataStoreDirectory = "datastore"
+const (
+	// DefaultDataStoreDirectory is the directory to store all the local IPFS data.
+	DefaultDataStoreDirectory = "datastore"
+
+	// DefaultBlockKeyCacheSize is the size for the blockstore two-queue
+	// cache which caches block keys and sizes.
+	DefaultBlockKeyCacheSize = 64 << 10
+)
 
 // Datastore tracks the configuration of the datastore.
 type Datastore struct {
@@ -23,7 +29,7 @@ type Datastore struct {
 
 	HashOnRead        bool
 	BloomFilterSize   int
-	BlockKeyCacheSize int
+	BlockKeyCacheSize OptionalInteger
 }
 
 // DataStorePath returns the default data store path given a configuration root

config/init.go

@@ -134,7 +134,6 @@ func DefaultDatastoreConfig() Datastore {
 		StorageGCWatermark: 90, // 90%
 		GCPeriod:           "1h",
 		BloomFilterSize:    0,
-		BlockKeyCacheSize:  64 << 10, // 64KiB
 		Spec:               flatfsSpec(),
 	}
 }

core/node/groups.go

@@ -189,7 +189,7 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config, userResourceOverrides rcmgr.Part
 func Storage(bcfg *BuildCfg, cfg *config.Config) fx.Option {
 	cacheOpts := blockstore.DefaultCacheOpts()
 	cacheOpts.HasBloomFilterSize = cfg.Datastore.BloomFilterSize
-	cacheOpts.HasTwoQueueCacheSize = cfg.Datastore.BlockKeyCacheSize
+	cacheOpts.HasTwoQueueCacheSize = int(cfg.Datastore.BlockKeyCacheSize.WithDefault(config.DefaultBlockKeyCacheSize))
 	if !bcfg.Permanent {
 		cacheOpts.HasBloomFilterSize = 0
 	}

docs/config.md

@@ -644,7 +644,7 @@ adjusted depending on the number of CIDs on disk.
 
 Default: `65536` (64KiB)
 
-Type: `integer` (non-negative, bytes)
+Type: `optionalInteger` (non-negative, bytes)
 
 ### `Datastore.Spec`