pico

feat(pgs): lru cache for object info and special files rss

created pr with 59.1 on 2025-04-06T03:01:44Z · by c8ef7d19

added 59.2 on 2025-04-06T03:03:49Z · by c8ef7d19


                      1:  2cf56f0 ! 1:  26daea4 feat(pgs): lru cache for object info and special files


                      2:  caace51 ! 2:  b004b64 chore(pgs): use http cache clear event to rm lru cache for special files

added 59.3 on 2025-04-06T19:08:31Z · by c8ef7d19


                      1:  26daea4 = 1:  26daea4 feat(pgs): lru cache for object info and special files


                      2:  b004b64 = 2:  b004b64 chore(pgs): use http cache clear event to rm lru cache for special files


                      -:  ------- > 3:  59f5618 refactor(pgs): store lru cache on web router

added 59.4 on 2025-04-06T19:41:38Z · by c8ef7d19


                      1:  26daea4 = 1:  26daea4 feat(pgs): lru cache for object info and special files


                      2:  b004b64 = 2:  b004b64 chore(pgs): use http cache clear event to rm lru cache for special files


                      3:  59f5618 = 3:  59f5618 refactor(pgs): store lru cache on web router


                      -:  ------- > 4:  ee12290 refactor(pgs): update minio lru and remove object info cache

cmds

checkout latest patchset:

ssh pr.pico.sh print 59 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 59.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 59

Patchset `59.1` on 2025-04-06T03:01:44Z · commit caace51

feat(pgs): lru cache for object info and special files

Eric Bower 2025-04-06T02:55:19Z

→ chore(pgs): use http cache clear event to rm lru cache for special files

Eric Bower 2025-04-06T03:01:01Z

chore(pgs): use http cache clear event to rm lru cache for special files

Eric Bower 2025-04-06T03:01:01Z

Semantic diff summary

1 added, 4 modified, 1 signature changed, 0 removed across 3 analyzed files

pkg/apps/pgs/web.go

function_declaration StartApiServer modified
method_declaration cacheMgmt signature changed
function_declaration cacheMgmt modified
function_declaration ServeAsset modified

pkg/apps/pgs/web_asset_handler.go

function_declaration ServeHTTP modified

pkg/cache/cache.go

function_declaration init added

+12 -2 pkg/apps/pgs/web.go #

......@@ -75,7 +75,7 @@ func StartApiServer(cfg *PgsConfig) {
		routes:  routes,
	}

	go routes.cacheMgmt(ctx, httpCache)
	go routes.cacheMgmt(ctx, httpCache, cfg.CacheClearingQueue)

	portStr := fmt.Sprintf(":%s", cfg.WebPort)
	cfg.Logger.Info(

......@@ -260,7 +260,7 @@ func (web *WebRouter) checkHandler(w http.ResponseWriter, r *http.Request) {
	w.WriteHeader(http.StatusNotFound)
}

func (web *WebRouter) cacheMgmt(ctx context.Context, httpCache *middleware.SouinBaseHandler) {
func (web *WebRouter) cacheMgmt(ctx context.Context, httpCache *middleware.SouinBaseHandler, notify chan string) {
	storer := httpCache.Storers[0]
	drain := createSubCacheDrain(ctx, web.Cfg.Logger)

......@@ -270,6 +270,7 @@ func (web *WebRouter) cacheMgmt(ctx context.Context, httpCache *middleware.Souin
		for scanner.Scan() {
			surrogateKey := strings.TrimSpace(scanner.Text())
			web.Cfg.Logger.Info("received cache-drain item", "surrogateKey", surrogateKey)
			notify <- surrogateKey

			if surrogateKey == "*" {
				storer.DeleteMany(".+")

......@@ -509,6 +510,15 @@ func (web *WebRouter) ServeAsset(fname string, opts *storage.ImgProcessOpts, fro
		}
	}

	go func() {
		for key := range web.Cfg.CacheClearingQueue {
			rKey := filepath.Join(key, "_redirects")
			redirectsCache.Remove(rKey)
			hKey := filepath.Join(key, "_headers")
			headersCache.Remove(hKey)
		}
	}()

	asset := &ApiAssetHandler{
		WebRouter: web,
		Logger:    logger,

+2 -2 pkg/apps/pgs/web_asset_handler.go #

......@@ -49,7 +49,7 @@ func (h *ApiAssetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
	logger := h.Logger
	var redirects []*RedirectRule

	redirectsCacheKey := filepath.Join(h.Bucket.Name, h.ProjectDir, "_redirects")
	redirectsCacheKey := filepath.Join(getSurrogateKey(h.UserID, h.ProjectDir), "_redirects")
	if cachedRedirects, found := redirectsCache.Get(redirectsCacheKey); found {
		redirects = cachedRedirects
	} else {

......@@ -179,7 +179,7 @@ func (h *ApiAssetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {

	var headers []*HeaderRule

	headersCacheKey := filepath.Join(h.Bucket.Name, h.ProjectDir, "_headers")
	headersCacheKey := filepath.Join(getSurrogateKey(h.UserID, h.ProjectDir), "_headers")
	if cachedHeaders, found := headersCache.Get(headersCacheKey); found {
		headers = cachedHeaders
	} else {

+21 -0 pkg/cache/cache.go #

......@@ -0,0 +1,21 @@
package cache

import (
	"log/slog"
	"time"

	"github.com/picosh/utils"
)

var CacheTimeout time.Duration

func init() {
	cacheDuration := utils.GetEnv("STORAGE_MINIO_CACHE_DURATION", "1m")
	duration, err := time.ParseDuration(cacheDuration)
	if err != nil {
		slog.Error("Invalid STORAGE_MINIO_CACHE_DURATION value, using default 1m", "error", err)
		duration = 1 * time.Minute
	}

	CacheTimeout = duration
}

...	...		@@ -260,7 +260,7 @@ func (web WebRouter) checkHandler(w http.ResponseWriter, r http.Request) {
260	260		w.WriteHeader(http.StatusNotFound)
261	261		}
262	262
263		-	func (web WebRouter) cacheMgmt(ctx context.Context, httpCache middleware.SouinBaseHandler) {
	263	+	func (web WebRouter) cacheMgmt(ctx context.Context, httpCache middleware.SouinBaseHandler, notify chan string) {
264	264		storer := httpCache.Storers[0]
265	265		drain := createSubCacheDrain(ctx, web.Cfg.Logger)
266	266

...	...		@@ -509,6 +510,15 @@ func (web WebRouter) ServeAsset(fname string, opts storage.ImgProcessOpts, fro
509	510		}
510	511		}
511	512
	513	+	go func() {
	514	+	for key := range web.Cfg.CacheClearingQueue {
	515	+	rKey := filepath.Join(key, "_redirects")
	516	+	redirectsCache.Remove(rKey)
	517	+	hKey := filepath.Join(key, "_headers")
	518	+	headersCache.Remove(hKey)
	519	+	}
	520	+	}()
	521	+
512	522		asset := &ApiAssetHandler{
513	523		WebRouter: web,
514	524		Logger: logger,

...	...		@@ -179,7 +179,7 @@ func (h ApiAssetHandler) ServeHTTP(w http.ResponseWriter, r http.Request) {
179	179
180	180		var headers []*HeaderRule
181	181
182		-	headersCacheKey := filepath.Join(h.Bucket.Name, h.ProjectDir, "_headers")
	182	+	headersCacheKey := filepath.Join(getSurrogateKey(h.UserID, h.ProjectDir), "_headers")
183	183		if cachedHeaders, found := headersCache.Get(headersCacheKey); found {
184	184		headers = cachedHeaders
185	185		} else {

...	...		@@ -75,7 +75,7 @@ func StartApiServer(cfg *PgsConfig) {
75	75		routes: routes,
76	76		}
77	77
78		-	go routes.cacheMgmt(ctx, httpCache)
	78	+	go routes.cacheMgmt(ctx, httpCache, cfg.CacheClearingQueue)
79	79
80	80		portStr := fmt.Sprintf(":%s", cfg.WebPort)
81	81		cfg.Logger.Info(

...	...		@@ -270,6 +270,7 @@ func (web WebRouter) cacheMgmt(ctx context.Context, httpCache middleware.Souin
270	270		for scanner.Scan() {
271	271		surrogateKey := strings.TrimSpace(scanner.Text())
272	272		web.Cfg.Logger.Info("received cache-drain item", "surrogateKey", surrogateKey)
	273	+	notify <- surrogateKey
273	274
274	275		if surrogateKey == "*" {
275	276		storer.DeleteMany(".+")

...	...		@@ -49,7 +49,7 @@ func (h ApiAssetHandler) ServeHTTP(w http.ResponseWriter, r http.Request) {
49	49		logger := h.Logger
50	50		var redirects []*RedirectRule
51	51
52		-	redirectsCacheKey := filepath.Join(h.Bucket.Name, h.ProjectDir, "_redirects")
	52	+	redirectsCacheKey := filepath.Join(getSurrogateKey(h.UserID, h.ProjectDir), "_redirects")
53	53		if cachedRedirects, found := redirectsCache.Get(redirectsCacheKey); found {
54	54		redirects = cachedRedirects
55	55		} else {

...	...		@@ -0,0 +1,21 @@
	1	+	package cache
	2	+
	3	+	import (
	4	+	"log/slog"
	5	+	"time"
	6	+
	7	+	"github.com/picosh/utils"
	8	+	)
	9	+
	10	+	var CacheTimeout time.Duration
	11	+
	12	+	func init() {
	13	+	cacheDuration := utils.GetEnv("STORAGE_MINIO_CACHE_DURATION", "1m")
	14	+	duration, err := time.ParseDuration(cacheDuration)
	15	+	if err != nil {
	16	+	slog.Error("Invalid STORAGE_MINIO_CACHE_DURATION value, using default 1m", "error", err)
	17	+	duration = 1 * time.Minute
	18	+	}
	19	+
	20	+	CacheTimeout = duration
	21	+	}

pico

Patchset 59.1 on 2025-04-06T03:01:44Z · commit caace51

Patchset `59.1` on 2025-04-06T03:01:44Z · commit caace51