[#1375] node: Configure of the container cache size
All checks were successful
DCO action / DCO (pull_request) Successful in 37s
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m41s
Tests and linters / Run gofumpt (pull_request) Successful in 2m59s
Vulncheck / Vulncheck (pull_request) Successful in 3m31s
Tests and linters / gopls check (pull_request) Successful in 3m48s
Tests and linters / Staticcheck (pull_request) Successful in 4m6s
Build / Build Components (pull_request) Successful in 4m33s
Tests and linters / Lint (pull_request) Successful in 4m40s
Tests and linters / Tests (pull_request) Successful in 7m35s
Tests and linters / Tests with -race (pull_request) Successful in 7m37s
All checks were successful
DCO action / DCO (pull_request) Successful in 37s
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m41s
Tests and linters / Run gofumpt (pull_request) Successful in 2m59s
Vulncheck / Vulncheck (pull_request) Successful in 3m31s
Tests and linters / gopls check (pull_request) Successful in 3m48s
Tests and linters / Staticcheck (pull_request) Successful in 4m6s
Build / Build Components (pull_request) Successful in 4m33s
Tests and linters / Lint (pull_request) Successful in 4m40s
Tests and linters / Tests (pull_request) Successful in 7m35s
Tests and linters / Tests with -race (pull_request) Successful in 7m37s
Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>
This commit is contained in:
parent
fd18aa363b
commit
4c77e17b4f
6 changed files with 55 additions and 35 deletions
|
@ -165,13 +165,11 @@ type ttlContainerStorage struct {
|
||||||
delInfoCache *ttlNetCache[cid.ID, *container.DelInfo]
|
delInfoCache *ttlNetCache[cid.ID, *container.DelInfo]
|
||||||
}
|
}
|
||||||
|
|
||||||
func newCachedContainerStorage(v container.Source, ttl time.Duration) ttlContainerStorage {
|
func newCachedContainerStorage(v container.Source, ttl time.Duration, containerCacheSize uint32) ttlContainerStorage {
|
||||||
const containerCacheSize = 100
|
lruCnrCache := newNetworkTTLCache(int(containerCacheSize), ttl, func(id cid.ID) (*container.Container, error) {
|
||||||
|
|
||||||
lruCnrCache := newNetworkTTLCache(containerCacheSize, ttl, func(id cid.ID) (*container.Container, error) {
|
|
||||||
return v.Get(id)
|
return v.Get(id)
|
||||||
}, metrics.NewCacheMetrics("container"))
|
}, metrics.NewCacheMetrics("container"))
|
||||||
lruDelInfoCache := newNetworkTTLCache(containerCacheSize, ttl, func(id cid.ID) (*container.DelInfo, error) {
|
lruDelInfoCache := newNetworkTTLCache(int(containerCacheSize), ttl, func(id cid.ID) (*container.DelInfo, error) {
|
||||||
return v.DeletionInfo(id)
|
return v.DeletionInfo(id)
|
||||||
}, metrics.NewCacheMetrics("container_deletion_info"))
|
}, metrics.NewCacheMetrics("container_deletion_info"))
|
||||||
|
|
||||||
|
|
|
@ -570,6 +570,8 @@ type cfgMorph struct {
|
||||||
// TTL of Sidechain cached values. Non-positive value disables caching.
|
// TTL of Sidechain cached values. Non-positive value disables caching.
|
||||||
cacheTTL time.Duration
|
cacheTTL time.Duration
|
||||||
|
|
||||||
|
containerCacheSize uint32
|
||||||
|
|
||||||
proxyScriptHash neogoutil.Uint160
|
proxyScriptHash neogoutil.Uint160
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,9 @@ const (
|
||||||
|
|
||||||
// FrostfsIDCacheSizeDefault is a default value of APE chain cache.
|
// FrostfsIDCacheSizeDefault is a default value of APE chain cache.
|
||||||
FrostfsIDCacheSizeDefault = 10_000
|
FrostfsIDCacheSizeDefault = 10_000
|
||||||
|
|
||||||
|
// ContainerCacheSizeDefault represents the default size for the container cache.
|
||||||
|
ContainerCacheSizeDefault = 100
|
||||||
)
|
)
|
||||||
|
|
||||||
var errNoMorphEndpoints = errors.New("no morph chain RPC endpoints, see `morph.rpc_endpoint` section")
|
var errNoMorphEndpoints = errors.New("no morph chain RPC endpoints, see `morph.rpc_endpoint` section")
|
||||||
|
@ -103,6 +106,18 @@ func CacheTTL(c *config.Config) time.Duration {
|
||||||
return CacheTTLDefault
|
return CacheTTLDefault
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ContainerCacheSize returns the value of "container_cache_size" config parameter
|
||||||
|
// from "morph" section.
|
||||||
|
//
|
||||||
|
// Returns 0 if the value is not positive integer.
|
||||||
|
// Returns ContainerCacheSizeDefault if the value is missing.
|
||||||
|
func ContainerCacheSize(c *config.Config) uint32 {
|
||||||
|
if c.Sub(subsection).Value("container_cache_size") == nil {
|
||||||
|
return ContainerCacheSizeDefault
|
||||||
|
}
|
||||||
|
return config.Uint32Safe(c.Sub(subsection), "container_cache_size")
|
||||||
|
}
|
||||||
|
|
||||||
// SwitchInterval returns the value of "switch_interval" config parameter
|
// SwitchInterval returns the value of "switch_interval" config parameter
|
||||||
// from "morph" section.
|
// from "morph" section.
|
||||||
//
|
//
|
||||||
|
|
|
@ -87,8 +87,9 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
|
||||||
cnrRdr.lister = client
|
cnrRdr.lister = client
|
||||||
} else {
|
} else {
|
||||||
// use RPC node as source of Container contract items (with caching)
|
// use RPC node as source of Container contract items (with caching)
|
||||||
cachedContainerStorage := newCachedContainerStorage(cnrSrc, c.cfgMorph.cacheTTL)
|
c.cfgObject.cnrSource = cnrSrc
|
||||||
cachedEACLStorage := newCachedEACLStorage(eACLFetcher, c.cfgMorph.cacheTTL)
|
if c.cfgMorph.containerCacheSize > 0 {
|
||||||
|
containerCache := newCachedContainerStorage(cnrSrc, c.cfgMorph.cacheTTL, c.cfgMorph.containerCacheSize)
|
||||||
|
|
||||||
subscribeToContainerCreation(c, func(e event.Event) {
|
subscribeToContainerCreation(c, func(e event.Event) {
|
||||||
ev := e.(containerEvent.PutSuccess)
|
ev := e.(containerEvent.PutSuccess)
|
||||||
|
@ -99,7 +100,7 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
|
||||||
// creation success are most commonly tracked by polling GET op.
|
// creation success are most commonly tracked by polling GET op.
|
||||||
cnr, err := cnrSrc.Get(ev.ID)
|
cnr, err := cnrSrc.Get(ev.ID)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
cachedContainerStorage.containerCache.set(ev.ID, cnr, nil)
|
containerCache.containerCache.set(ev.ID, cnr, nil)
|
||||||
} else {
|
} else {
|
||||||
// unlike removal, we expect successful receive of the container
|
// unlike removal, we expect successful receive of the container
|
||||||
// after successful creation, so logging can be useful
|
// after successful creation, so logging can be useful
|
||||||
|
@ -116,14 +117,16 @@ func configureEACLAndContainerSources(c *cfg, client *cntClient.Client, cnrSrc c
|
||||||
|
|
||||||
subscribeToContainerRemoval(c, func(e event.Event) {
|
subscribeToContainerRemoval(c, func(e event.Event) {
|
||||||
ev := e.(containerEvent.DeleteSuccess)
|
ev := e.(containerEvent.DeleteSuccess)
|
||||||
cachedContainerStorage.handleRemoval(ev.ID)
|
containerCache.handleRemoval(ev.ID)
|
||||||
c.log.Debug(logs.FrostFSNodeContainerRemovalEventsReceipt,
|
c.log.Debug(logs.FrostFSNodeContainerRemovalEventsReceipt,
|
||||||
zap.Stringer("id", ev.ID),
|
zap.Stringer("id", ev.ID),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
c.cfgObject.cnrSource = containerCache
|
||||||
|
}
|
||||||
|
|
||||||
|
cachedEACLStorage := newCachedEACLStorage(eACLFetcher, c.cfgMorph.cacheTTL)
|
||||||
c.cfgObject.eaclSource = cachedEACLStorage
|
c.cfgObject.eaclSource = cachedEACLStorage
|
||||||
c.cfgObject.cnrSource = cachedContainerStorage
|
|
||||||
|
|
||||||
cnrRdr.lister = client
|
cnrRdr.lister = client
|
||||||
cnrRdr.eacl = c.cfgObject.eaclSource
|
cnrRdr.eacl = c.cfgObject.eaclSource
|
||||||
|
|
|
@ -90,6 +90,7 @@ func initMorphComponents(ctx context.Context, c *cfg) {
|
||||||
|
|
||||||
var netmapSource netmap.Source
|
var netmapSource netmap.Source
|
||||||
|
|
||||||
|
c.cfgMorph.containerCacheSize = morphconfig.ContainerCacheSize(c.appCfg)
|
||||||
c.cfgMorph.cacheTTL = morphconfig.CacheTTL(c.appCfg)
|
c.cfgMorph.cacheTTL = morphconfig.CacheTTL(c.appCfg)
|
||||||
|
|
||||||
if c.cfgMorph.cacheTTL == 0 {
|
if c.cfgMorph.cacheTTL == 0 {
|
||||||
|
|
|
@ -81,6 +81,7 @@ morph:
|
||||||
cache_ttl: 15s # Sidechain cache TTL value (min interval between similar calls). Negative value disables caching.
|
cache_ttl: 15s # Sidechain cache TTL value (min interval between similar calls). Negative value disables caching.
|
||||||
# Default value: block time. It is recommended to have this value less or equal to block time.
|
# Default value: block time. It is recommended to have this value less or equal to block time.
|
||||||
# Cached entities: containers, container lists, eACL tables.
|
# Cached entities: containers, container lists, eACL tables.
|
||||||
|
container_cache_size: 100 # container_cache_size is is the maximum number of containers in the cache.
|
||||||
switch_interval: 3m # interval b/w RPC switch attempts if the node is connected not to the highest priority node
|
switch_interval: 3m # interval b/w RPC switch attempts if the node is connected not to the highest priority node
|
||||||
rpc_endpoint: # side chain NEO RPC endpoints; are shuffled and used one by one until the first success
|
rpc_endpoint: # side chain NEO RPC endpoints; are shuffled and used one by one until the first success
|
||||||
- address: wss://rpc1.morph.frostfs.info:40341/ws
|
- address: wss://rpc1.morph.frostfs.info:40341/ws
|
||||||
|
|
Loading…
Reference in a new issue