feat: refactoring steve cache (#6278)

* feat: caching with gcache instead of sync.Map * fix: slow request * feat: add cache configuration information to bootstrap * perf: go fmt * feat: setting environment variables * feat: init when create steve cache and using the built-in method to get Internal Client Context * feat: note yaml config * feat: log more error details * feat: log more error details
erda-project · Jul 2, 2024 · 1d5d1d6 · 1d5d1d6
1 parent 941eb31
commit 1d5d1d6
Show file tree

Hide file tree

Showing 5 changed files with 141 additions and 73 deletions.
diff --git a/cmd/erda-server/bootstrap.yaml b/cmd/erda-server/bootstrap.yaml
@@ -371,9 +371,13 @@ erda.dop.rule.action.dingtalkworknotice: { }
 #erda.core.org: {}
 
 ########### cmp
-cmp: { }
+cmp:
+  # steve cache time to live, default 10 min
+  cache_ttl: ${CMP_STEVE_CACHE_TTL:10m}
+  # steve cache total size (MB), default 64MB
+  cache_size: ${CMP_STEVE_CACHE_SIZE:64}
 [email protected]:
-  addr: "${MONITOR_GRPC_ADDR:monitor:7080}"
+  addr: "${MONITOR_GRPC_ADDR:monitor:7080}"xwxxx
   block: false
 erda.core.monitor.metric-client: { }
 [email protected]:

diff --git a/internal/apps/cmp/endpoints/endpoints.go b/internal/apps/cmp/endpoints/endpoints.go
@@ -17,6 +17,7 @@ package endpoints
 import (
 	"context"
 	"net/http"
+	"time"
 
 	clusterpb "github.com/erda-project/erda-proto-go/core/clustermanager/cluster/pb"
 	cronpb "github.com/erda-project/erda-proto-go/core/pipeline/cron/pb"
@@ -62,10 +63,16 @@ type Endpoints struct {
 	ClusterSvc      clusterpb.ClusterServiceServer
 	PipelineSvc     pipelinepb.PipelineServiceServer
 
-	reportTable *resource.ReportTable
-	CronService cronpb.CronServiceServer
-	org         org.Interface
-	registry    registry.Interface
+	reportTable      *resource.ReportTable
+	CronService      cronpb.CronServiceServer
+	org              org.Interface
+	registry         registry.Interface
+	SteveCacheConfig *steveCacheConfig
+}
+
+type steveCacheConfig struct {
+	TTL  time.Duration
+	Size int
 }
 
 type Option func(*Endpoints)
@@ -88,7 +95,7 @@ func New(ctx context.Context, db *dbclient.DBClient, js jsonstore.JsonStore, cac
 	e.metrics = ctx.Value("metrics").(*metrics.Metric)
 	e.Resource = ctx.Value("resource").(*resource.Resource)
 	e.CachedJS = cachedJS
-	e.SteveAggregator = steve.NewAggregator(ctx, e.bdl, e.ClusterSvc)
+	e.SteveAggregator = steve.NewAggregator(ctx, e.bdl, e.ClusterSvc, e.SteveCacheConfig.TTL, e.SteveCacheConfig.Size)
 	e.registry = registry.New(e.ClusterSvc)
 	return e
 }
@@ -97,6 +104,15 @@ func (e *Endpoints) GetCluster() *clusters.Clusters {
 	return e.clusters
 }
 
+func WithSteveCacheConfig(ttl time.Duration, size int) Option {
+	return func(e *Endpoints) {
+		e.SteveCacheConfig = &steveCacheConfig{
+			TTL:  ttl,
+			Size: size,
+		}
+	}
+}
+
 // WithBundle With bundle
 func WithBundle(bdl *bundle.Bundle) Option {
 	return func(e *Endpoints) {

diff --git a/internal/apps/cmp/initialize.go b/internal/apps/cmp/initialize.go
@@ -218,6 +218,7 @@ func (p *provider) initEndpoints(ctx context.Context, db *dbclient.DBClient, js,
 		endpoints.WithClusterServiceServer(p.ClusterSvc),
 		endpoints.WithOrg(p.Org),
 		endpoints.WithPipelineSvc(p.PipelineSvc),
+		endpoints.WithSteveCacheConfig(p.Cfg.SteveCacheTTL, p.Cfg.SteveCacheSize),
 	)
 
 	// Sync org resource task status

diff --git a/internal/apps/cmp/provider.go b/internal/apps/cmp/provider.go
@@ -67,6 +67,12 @@ type provider struct {
 	Tran            i18n.Translator `translator:"common"`
 	SteveAggregator *steve.Aggregator
 	Org             org.Interface
+	Cfg             *config
+}
+
+type config struct {
+	SteveCacheTTL  time.Duration `file:"cache_ttl" default:"10m"`
+	SteveCacheSize int           `file:"cache_size" default:"5000"`
 }
 
 // Run Run the provider