Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2021-12-01 02:12:15 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2021-12-01 02:12:15 +0300
commit17c333c2a8de78c08dd070431652cc844fcc7b57 (patch)
tree740e9d1331a0a3adf9ba7515f7bb5ddc8d67c3d2
parentaa91e391469b832a925ebe81cdf575b1ea59c2ad (diff)
chore: update method names
-rw-r--r--app.go3
-rw-r--r--internal/lru/lru.go6
-rw-r--r--internal/vfs/zip/vfs.go8
3 files changed, 9 insertions, 8 deletions
diff --git a/app.go b/app.go
index 1cbce369..fdebf56f 100644
--- a/app.go
+++ b/app.go
@@ -267,6 +267,9 @@ func (a *theApp) buildHandlerPipeline() (http.Handler, error) {
if a.config.RateLimit.SourceIPLimitPerSecond > 0 {
rl := ratelimiter.New(
lru.New("source_ip",
+ // based on an avg ~4,000 unique IPs per minute
+ // https://log.gprd.gitlab.net/app/lens#/edit/f7110d00-2013-11ec-8c8e-ed83b5469915?_g=h@e78830b
+ lru.WithMaxSize(5000),
lru.WithCachedEntriesMetric(metrics.RateLimitSourceIPCachedEntries),
lru.WithCachedRequestsMetric(metrics.RateLimitSourceIPCacheRequests),
),
diff --git a/internal/lru/lru.go b/internal/lru/lru.go
index 8927c97b..dafb5347 100644
--- a/internal/lru/lru.go
+++ b/internal/lru/lru.go
@@ -17,8 +17,6 @@ const getsPerPromote = 64
// needs to be pruned on OOM, this prunes 1/16 of items
const itemsToPruneDiv = 16
-// based on an avg ~4,000 unique IPs per minute
-// https://log.gprd.gitlab.net/app/lens#/edit/f7110d00-2013-11ec-8c8e-ed83b5469915?_g=h@e78830b
const defaultCacheMaxSize = 1000
const defaultCacheExpirationInterval = time.Minute
@@ -41,8 +39,8 @@ type Cache struct {
func New(op string, opts ...Option) *Cache {
c := &Cache{
op: op,
- duration: defaultSourceIPExpirationInterval,
- maxSize: defaultSourceIPItems,
+ duration: defaultCacheExpirationInterval,
+ maxSize: defaultCacheMaxSize,
}
for _, opt := range opts {
diff --git a/internal/vfs/zip/vfs.go b/internal/vfs/zip/vfs.go
index 24d32163..92a994ec 100644
--- a/internal/vfs/zip/vfs.go
+++ b/internal/vfs/zip/vfs.go
@@ -86,15 +86,15 @@ func New(cfg *config.ZipServing) vfs.VFS {
// TODO: To be removed with https://gitlab.com/gitlab-org/gitlab-pages/-/issues/480
zipVFS.dataOffsetCache = lru.New(
"data-offset",
- lru.WithSourceIPItems(defaultDataOffsetItems),
- lru.WithSourceIPExpirationInterval(defaultDataOffsetExpirationInterval),
+ lru.WithMaxSize(defaultDataOffsetItems),
+ lru.WithExpirationInterval(defaultDataOffsetExpirationInterval),
lru.WithCachedEntriesMetric(metrics.ZipCachedEntries),
lru.WithCachedRequestsMetric(metrics.ZipCacheRequests),
)
zipVFS.readlinkCache = lru.New(
"readlink",
- lru.WithSourceIPItems(defaultReadlinkItems),
- lru.WithSourceIPExpirationInterval(defaultReadlinkExpirationInterval),
+ lru.WithMaxSize(defaultReadlinkItems),
+ lru.WithExpirationInterval(defaultReadlinkExpirationInterval),
lru.WithCachedEntriesMetric(metrics.ZipCachedEntries),
lru.WithCachedRequestsMetric(metrics.ZipCacheRequests),
)