NVIDIA
diff --git a/Collapse file
‎ais/daemon.go‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎ais/daemon.go‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎ais/htrun.go‎
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions b/Collapse file
‎ais/htrun.go‎
Copy file name to clipboard
+27Lines changed: 27 additions & 0 deletions
diff --git a/Collapse file
‎ais/prate_limit.go‎
Copy file name to clipboard
-65Lines changed: 0 additions & 65 deletions b/Collapse file
‎ais/prate_limit.go‎
Copy file name to clipboard
-65Lines changed: 0 additions & 65 deletions
diff --git a/Collapse file
‎ais/proxy.go‎
Copy file name to clipboard
+30-5Lines changed: 30 additions & 5 deletions b/Collapse file
‎ais/proxy.go‎
Copy file name to clipboard
+30-5Lines changed: 30 additions & 5 deletions
diff --git a/Collapse file
‎ais/rlbackend.go‎
Copy file name to clipboard
+110Lines changed: 110 additions & 0 deletions b/Collapse file
‎ais/rlbackend.go‎
Copy file name to clipboard
+110Lines changed: 110 additions & 0 deletions
@@ -321,7 +321,7 @@ func newProxy(co *configOwner) *proxy {
 }
 
 func newTarget(co *configOwner) *target {
-	t := &target{backend: make(backends, 8)}
+	t := &target{}
 	t.owner.bmd = newBMDOwnerTgt()
 	t.owner.etl = newEtlMDOwnerTgt()
 	t.owner.config = co
 
@@ -36,6 +36,7 @@ import (
 	"github.com/NVIDIA/aistore/cmn/nlog"
 	"github.com/NVIDIA/aistore/core"
 	"github.com/NVIDIA/aistore/core/meta"
+	"github.com/NVIDIA/aistore/hk"
 	"github.com/NVIDIA/aistore/memsys"
 	"github.com/NVIDIA/aistore/stats"
 	"github.com/NVIDIA/aistore/sys"
@@ -65,6 +66,11 @@ type htext interface {
 	interruptedRestarted() (bool, bool)
 }
 
+type ratelim struct {
+	sync.Map
+	now int64
+}
+
 type htrun struct {
 	owner struct {
 		smap   *smapOwner
@@ -78,6 +84,7 @@ type htrun struct {
 	si        *meta.Snode
 	gmm       *memsys.MMSA // system pagesize-based memory manager and slab allocator
 	smm       *memsys.MMSA // small-size allocator (up to 4K)
+	ratelim   ratelim
 	startup   struct {
 		cluster atomic.Int64 // mono.NanoTime() since cluster startup, zero prior to that
 		node    atomic.Int64 // ditto - for this node
@@ -310,6 +317,8 @@ func (h *htrun) init(config *cmn.Config) {
 	h.gmm.RegWithHK()
 	h.smm = memsys.ByteMM()
 	h.smm.RegWithHK()
+
+	hk.Reg("rate-limit"+hk.NameSuffix, h.ratelim.housekeep, hk.PruneRateLimiters)
 }
 
 // steps 1 thru 4
@@ -2384,3 +2393,21 @@ func (h *htrun) _status(smap *smapX) (daeStatus string) {
 	}
 	return
 }
+
+//
+// common housekeeping for rate limiters
+//
+
+func (rl *ratelim) housekeep(now int64) time.Duration {
+	rl.now = now
+	rl.Range(rl.cleanup)
+	return hk.PruneRateLimiters
+}
+
+func (rl *ratelim) cleanup(k, v any) bool {
+	r := v.(cos.Rater)
+	if time.Duration(rl.now-r.LastUsed()) >= hk.PruneRateLimiters>>1 {
+		rl.Delete(k)
+	}
+	return true // keep going
+}
@@ -61,7 +61,6 @@ type (
 		rproxy     reverseProxy
 		notifs     notifs
 		lstca      lstca
-		ratelim    ratelim
 		reg        struct {
 			pool nodeRegPool
 			mu   sync.RWMutex
@@ -201,7 +200,6 @@ func (p *proxy) Run() error {
 	p.rproxy.init()
 
 	p.notifs.init(p)
-	p.ratelim.init()
 	p.ic.init(p)
 
 	//
@@ -749,7 +747,7 @@ func (p *proxy) httpobjget(w http.ResponseWriter, r *http.Request, origURLBck ..
 
 	// 3. rate limit
 	smap := p.owner.smap.get()
-	if err := p.ratelim.apply(bck, http.MethodGet, smap); err != nil {
+	if err := p.ratelimit(bck, http.MethodGet, smap); err != nil {
 		p.writeErr(w, r, err, http.StatusTooManyRequests, Silent)
 		return
 	}
@@ -822,7 +820,7 @@ func (p *proxy) httpobjput(w http.ResponseWriter, r *http.Request, apireq *apiRe
 
 	// 3. rate limit
 	smap := p.owner.smap.get()
-	if err := p.ratelim.apply(bck, http.MethodPut, smap); err != nil {
+	if err := p.ratelimit(bck, http.MethodPut, smap); err != nil {
 		p.writeErr(w, r, err, http.StatusTooManyRequests, Silent)
 		return
 	}
@@ -893,7 +891,7 @@ func (p *proxy) httpobjdelete(w http.ResponseWriter, r *http.Request) {
 
 	// rate limit
 	smap := p.owner.smap.get()
-	if err := p.ratelim.apply(bck, http.MethodDelete, smap); err != nil {
+	if err := p.ratelimit(bck, http.MethodDelete, smap); err != nil {
 		p.writeErr(w, r, err, http.StatusTooManyRequests, Silent)
 		return
 	}
@@ -3422,6 +3420,33 @@ func (p *proxy) notifyCandidate(npsi *meta.Snode, smap *smapX) {
 	cmn.HreqFree(req)
 }
 
+//
+// rate limit on the front
+//
+
+func (p *proxy) ratelimit(bck *meta.Bck, verb string, smap *smapX) error {
+	if !bck.Props.RateLimit.Frontend.Enabled {
+		return nil
+	}
+	var (
+		brl   *cos.BurstRateLim // bursty
+		rl    = &p.ratelim
+		uhash = bck.HashUname(verb)
+		v, ok = rl.Load(uhash)
+	)
+	if ok {
+		brl = v.(*cos.BurstRateLim)
+	} else {
+		// ignore sleep time - only relevant for clients
+		brl, _ = bck.NewFrontendRateLim(smap.CountActivePs())
+		rl.Store(uhash, brl)
+	}
+	if !brl.TryAcquire() {
+		return errors.New(http.StatusText(http.StatusTooManyRequests))
+	}
+	return nil
+}
+
 //
 // list-objects helpers
 //
 
@@ -0,0 +1,110 @@
+// Package ais provides AIStore's proxy and target nodes.
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved.
+ */
+package ais
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"time"
+
+	"github.com/NVIDIA/aistore/cmn"
+	"github.com/NVIDIA/aistore/cmn/cos"
+	"github.com/NVIDIA/aistore/core"
+	"github.com/NVIDIA/aistore/core/meta"
+	"github.com/NVIDIA/aistore/stats"
+)
+
+// NOTE: backend.GetObjReader is handled elsewhere - by xactions
+
+// TODO -- FIXME: nil context (below); callers to provide context
+
+type (
+	rlbackend struct {
+		core.Backend
+		t *target
+	}
+)
+
+func (bp *rlbackend) GetObj(ctx context.Context, lom *core.LOM, owt cmn.OWT, origReq *http.Request) (ecode int, err error) {
+	var tot time.Duration
+	for tot < cos.DfltRateMaxWait {
+		ecode, err = bp.Backend.GetObj(ctx, lom, owt, origReq)
+		if err == nil {
+			return ecode, nil
+		}
+		sleep := bp.retry(ctx, err, lom.Bck(), http.MethodGet, stats.GetRateRetryLatencyTotal)
+		if sleep == 0 {
+			return ecode, err
+		}
+		tot += sleep
+	}
+	return ecode, err
+}
+
+func (bp *rlbackend) PutObj(ctx context.Context, r io.ReadCloser, lom *core.LOM, origReq *http.Request) (ecode int, err error) {
+	var tot time.Duration
+	for tot < cos.DfltRateMaxWait {
+		ecode, err = bp.Backend.PutObj(ctx, r, lom, origReq)
+		if err == nil {
+			return ecode, nil
+		}
+		sleep := bp.retry(ctx, err, lom.Bck(), http.MethodPut, stats.PutRateRetryLatencyTotal)
+		if sleep == 0 {
+			return ecode, err
+		}
+		tot += sleep
+	}
+	return ecode, err
+}
+
+func (bp *rlbackend) DeleteObj(ctx context.Context, lom *core.LOM) (ecode int, err error) {
+	var tot time.Duration
+	for tot < cos.DfltRateMaxWait {
+		ecode, err = bp.Backend.DeleteObj(ctx, lom)
+		if err == nil {
+			return ecode, nil
+		}
+		sleep := bp.retry(ctx, err, lom.Bck(), http.MethodDelete, stats.DeleteRateRetryLatencyTotal)
+		if sleep == 0 {
+			return ecode, err
+		}
+		tot += sleep
+	}
+	return ecode, err
+}
+
+//
+// apply (compare with ais/prate_limit)
+//
+
+func (bp *rlbackend) retry(ctx context.Context, err error, bck *meta.Bck, verb, metric string) time.Duration {
+	if !cmn.IsErrTooManyRequests(err) || !bck.Props.RateLimit.Backend.Enabled {
+		return 0
+	}
+
+	var (
+		arl   *cos.AdaptRateLim
+		uhash = bck.HashUname(verb) // see also (*RateLimitConf)verbs
+		v, ok = bp.t.ratelim.Load(uhash)
+	)
+	if ok {
+		arl = v.(*cos.AdaptRateLim)
+	} else {
+		smap := bp.t.owner.smap.get()
+		arl, _ = bck.NewBackendRateLim(smap.CountActiveTs())
+		bp.t.ratelim.Store(uhash, arl)
+	}
+
+	// onerr
+	sleep := arl.OnErr()
+
+	_ = ctx // TODO -- FIXME: in progress
+	vlabs := map[string]string{stats.VarlabBucket: bck.Cname(""), stats.VarlabXactKind: ""}
+	bp.t.StatsUpdater().AddWith(
+		cos.NamedVal64{Name: metric, Value: int64(sleep), VarLabs: vlabs},
+	)
+	return sleep
+}
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ func newProxy(co configOwner) proxy {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`func newTarget(co configOwner) target {`
`324`		`- t := &target{backend: make(backends, 8)}`
	`324`	`+ t := &target{}`
`325`	`325`	`t.owner.bmd = newBMDOwnerTgt()`
`326`	`326`	`t.owner.etl = newEtlMDOwnerTgt()`
`327`	`327`	`t.owner.config = co`