cache: keep redis readers by pointer

A pooled SimpleRedis holds a sync.Mutex, so appending one into rc.readers by value copies the lock and trips go vet's copylocks check. Keep the readers by pointer instead; the round-robin over replicas is unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D95Nh68xKXhynPXHzozrXp
⬆️ renovate: Update all (#375 )
2026-09-02 20:28:50 +02:00 · 2026-08-25 19:40:35 +02:00 · 2026-08-20 12:05:45 +02:00 · 2026-08-07 19:11:54 +02:00 · 2026-08-07 12:15:10 +02:00 · 2026-07-31 13:05:36 +02:00
19 changed files with 45 additions and 35 deletions
@@ -19,7 +19,7 @@ jobs:
    steps:
      - uses: actions/checkout@v7
      - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
        with:
          # Track go.mod (Go 1.22) — the plugin's yaegi-bound floor. Keeps the
          # single source of truth and builds the mock on the supported version.
@@ -32,7 +32,7 @@ jobs:

      # https://github.com/marketplace/actions/setup-go-environment
      - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
        with:
          go-version: ${{ env.GO_VERSION }}

@@ -28,7 +28,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Run Renovate
-        uses: renovatebot/github-action@v46.1.21
+        uses: renovatebot/github-action@v46.2.2
        with:
          token: ${{ secrets.RENOVATE_TOKEN }}
        env:
@@ -641,7 +641,12 @@ func handleStreamCache(bouncer *Bouncer) error {
 	if err.Error() != cache.CacheMiss {
 		return err
 	}
-	bouncer.cacheClient.Set(cacheTimeoutKey, cache.NoBannedValue, bouncer.updateInterval-1)
+	// To avoid every instance trying to update the cache, set 1 second at least
+	leaseDuration := bouncer.updateInterval - 1
+	if leaseDuration < 1 {
+		leaseDuration = 1
+	}
+	bouncer.cacheClient.Set(cacheTimeoutKey, cache.NoBannedValue, leaseDuration)
 	streamRouteURL := url.URL{
 		Scheme:   bouncer.crowdsecScheme,
 		Host:     bouncer.crowdsecHost,
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -12,7 +12,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
    volumes:
      - "/var/run/docker.sock:/var/run/docker.sock:ro"
      # - './ban.html:/ban.html:ro'
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -1,6 +1,6 @@
 services:
  cloudflare:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "cloudflare"
    restart: unless-stopped
    command:
@@ -19,7 +19,7 @@ services:
      - 8080:8080

  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -33,7 +33,7 @@ services:
      - "--entrypoints.web.forwardedheaders.trustedips=172.21.0.5"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
      - logs-traefik:/var/log/traefik
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -14,7 +14,7 @@ services:
      - "--entrypoints.web.forwardedheaders.trustedips=172.18.0.0/24"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -1,5 +1,5 @@
 image:
-  tag: v3.7.9
+  tag: v3.7.11

 logs:
  general:
@@ -15,4 +15,4 @@ experimental:
  plugins:
    bouncer:
      moduleName: "github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      version: "v1.7.0"
+      version: "v1.7.1"
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -87,7 +87,7 @@ services:
      - "traefik.enable=false"

  redis-secure:
-    image: "redis:8.8.1-alpine"
+    image: "redis:8.10.0-alpine"
    container_name: "redis-secure"
    hostname: redis-secure
    restart: unless-stopped
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -1,6 +1,6 @@
 services:
  traefik:
-    image: "traefik:v3.7.9"
+    image: "traefik:v3.7.11"
    container_name: "traefik"
    restart: unless-stopped
    command:
@@ -13,7 +13,7 @@ services:
      - "--entrypoints.web.address=:80"

      - "--experimental.plugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      - "--experimental.plugins.bouncer.version=v1.7.0"
+      - "--experimental.plugins.bouncer.version=v1.7.1"
      # - "--experimental.localplugins.bouncer.modulename=github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock:ro
@@ -52,7 +52,7 @@ func (localCache) delete(key string) {
 type redisCache struct {
 	log     *slog.Logger
 	writer  simpleredis.SimpleRedis
-	readers []simpleredis.SimpleRedis
+	readers []*simpleredis.SimpleRedis
 	counter atomic.Uint64
 }

@@ -62,7 +62,7 @@ func (rc *redisCache) nextReader() *simpleredis.SimpleRedis {
 		return &rc.writer
 	}
 	idx := rc.counter.Add(1) % uint64(n)
-	return &rc.readers[idx]
+	return rc.readers[idx]
 }

 func (rc *redisCache) get(key string) (string, error) {
@@ -115,7 +115,9 @@ func (c *Client) New(log *slog.Logger, isRedis bool, writeHost string, readHosts
 		rc := &redisCache{log: log}
 		rc.writer.Init(writeHost, pass, database)
 		for _, h := range readHosts {
-			var r simpleredis.SimpleRedis
+			// A pooled SimpleRedis holds a mutex, so it is kept by pointer:
+			// appending it by value would copy the lock along with it.
+			r := &simpleredis.SimpleRedis{}
 			r.Init(h, pass, database)
 			rc.readers = append(rc.readers, r)
 		}
@@ -130,7 +130,7 @@ func indexOfReader(rc *redisCache, r *simpleredis.SimpleRedis) int {
 		return -1
 	}
 	for i := range rc.readers {
-		if r == &rc.readers[i] {
+		if r == rc.readers[i] {
 			return i
 		}
 	}
@@ -151,7 +151,10 @@ func Test_nextReader(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			rc := &redisCache{log: logger.New("INFO", "")}
-			rc.readers = make([]simpleredis.SimpleRedis, tt.readers)
+			rc.readers = make([]*simpleredis.SimpleRedis, tt.readers)
+			for i := range rc.readers {
+				rc.readers[i] = &simpleredis.SimpleRedis{}
+			}
 			for call, want := range tt.want {
 				if got := indexOfReader(rc, rc.nextReader()); got != want {
 					t.Errorf("call %d: nextReader() -> reader[%d], want reader[%d]", call, got, want)
@@ -14,7 +14,7 @@
 set -euo pipefail

 # Pinned to match the Docker suite (tests/e2e/scenarios/*/docker-compose.yml).
-TRAEFIK_VERSION="${TRAEFIK_VERSION:-v3.7.9}"
+TRAEFIK_VERSION="${TRAEFIK_VERSION:-v3.7.11}"

 WEB_PORT="${WEB_PORT:-8000}"
 LAPI_PORT="${LAPI_PORT:-8090}"
Author	SHA1	Message	Date
mhxandClaude Opus 5	f359d5d935	cache: keep redis readers by pointer A pooled SimpleRedis holds a sync.Mutex, so appending one into rc.readers by value copies the lock and trips go vet's copylocks check. Keep the readers by pointer instead; the round-robin over replicas is unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01D95Nh68xKXhynPXHzozrXp	2026-08-25 19:40:35 +02:00
maxlerebourgandRenovate Bot	ae7481caa5	⬆️ renovate: Update all (#375 ) Co-authored-by: Renovate Bot <22881669+maxlerebourg@users.noreply.github.com>	2026-08-20 12:05:45 +02:00
mathieuHaandmaxlerebourg	9b8d6b937c	🐛 keep the stream lease alive when updateIntervalSeconds is 1 (#371 ) * 🐛 keep the stream lease alive when updateIntervalSeconds is 1 handleStreamCache takes a lease so a single node polls LAPI per interval, and stores it for updateInterval-1 seconds. The e2e stream scenario now sets updateIntervalSeconds to 1, which makes that a 0 second duration: golang-ttl-map returns early on a zero ttl (map.go:114) and redis rejects a non positive EX, so the lease is never stored and the guard silently does nothing. Floor the duration at 1 second. At an interval of 1 the lease can survive a tick that fires slightly early and cost one skipped poll, which is far better than every node polling every tick against a shared redis. * Adjust lease duration to prevent cache update conflicts Updated lease duration logic to ensure a minimum of 1 second. --------- Co-authored-by: maxlerebourg <maxlerebourg@gmail.com>	2026-08-07 19:11:54 +02:00
maxlerebourgandRenovate Bot	d57ead2ec7	⬆️ renovate: Update actions/setup-go action to v7 (#364 ) Co-authored-by: Renovate Bot <22881669+maxlerebourg@users.noreply.github.com>	2026-08-07 12:15:10 +02:00
github-actions[bot]andgithub-actions[bot]	bef5dfaadb	🔖 release v1.7.1 (#367 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2026-07-31 13:05:36 +02:00