From d01e9b400d3083791a78fa05c18bcf9d753b9e6c Mon Sep 17 00:00:00 2001
From: Julian Sommer <115516918+juliansommer@users.noreply.github.com>
Date: Wed, 21 Oct 2026 10:10:00 +1100
Subject: [PATCH] test: assert a TTL kvstore bucket is created at the cluster's
 replica count on a three-node cluster (#1236)

---
 spinifex/foundation/state/kvstore/bucket.go   |  3 +-
 .../foundation/state/kvstore/cluster_test.go  | 95 +++++++++++++++++++
 2 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 spinifex/foundation/state/kvstore/cluster_test.go

diff --git a/spinifex/foundation/state/kvstore/bucket.go b/spinifex/foundation/state/kvstore/bucket.go
index ccfe2b336..8e7db23af 100644
--- a/spinifex/foundation/state/kvstore/bucket.go
+++ b/spinifex/foundation/state/kvstore/bucket.go
@@ -378,7 +378,8 @@ func (b *Bucket) WatchFrom(ctx context.Context, filter string, revision uint64)
 	return w, nil
 }
 
-// open picks the kvutil helper matching the configured TTL and replica count.
+// open attaches to the bucket or creates it through kvutil, which sets the
+// cluster's replica count on every bucket, TTL-backed or not.
 func (b *Bucket) open(ctx context.Context) (jetstream.KeyValue, error) {
 	switch {
 	case b.cfg.AttachOnly:
diff --git a/spinifex/foundation/state/kvstore/cluster_test.go b/spinifex/foundation/state/kvstore/cluster_test.go
new file mode 100644
index 000000000..3cb24e347
--- /dev/null
+++ b/spinifex/foundation/state/kvstore/cluster_test.go
@@ -0,0 +1,95 @@
+package kvstore_test
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/mulgadc/spinifex/spinifex/foundation/state/clustersize"
+	"github.com/mulgadc/spinifex/spinifex/foundation/state/kvstore"
+	"github.com/nats-io/nats-server/v2/server"
+	"github.com/nats-io/nats.go"
+	"github.com/nats-io/nats.go/jetstream"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// startJetStreamCluster starts n routed JetStream servers and returns a handle
+// connected to the first, so a create can actually place n replicas.
+func startJetStreamCluster(t *testing.T, n int) jetstream.JetStream {
+	t.Helper()
+	ports := make([]int, n)
+	routes := make([]string, n)
+	for i := range ports {
+		l, err := net.Listen("tcp", "127.0.0.1:0")
+		require.NoError(t, err)
+		ports[i] = l.Addr().(*net.TCPAddr).Port
+		require.NoError(t, l.Close())
+		routes[i] = fmt.Sprintf("nats://127.0.0.1:%d", ports[i])
+	}
+	servers := make([]*server.Server, n)
+	for i := range servers {
+		ns, err := server.NewServer(&server.Options{
+			ServerName: fmt.Sprintf("s%d", i+1), JetStream: true, StoreDir: t.TempDir(),
+			Host: "127.0.0.1", Port: -1, NoLog: true, NoSigs: true,
+			Cluster: server.ClusterOpts{Name: "kvstore", Host: "127.0.0.1", Port: ports[i]},
+			Routes:  server.RoutesFromStr(strings.Join(routes, ",")),
+		})
+		require.NoError(t, err)
+		ns.Start()
+		servers[i] = ns
+	}
+	t.Cleanup(func() {
+		for _, ns := range servers {
+			ns.Shutdown()
+			ns.WaitForShutdown()
+		}
+	})
+
+	nc, err := nats.Connect("", nats.InProcessServer(servers[0]))
+	require.NoError(t, err)
+	t.Cleanup(nc.Close)
+	js, err := jetstream.New(nc)
+	require.NoError(t, err)
+	return js
+}
+
+// TestBucket_TTLBucketIsReplicatedAcrossTheCluster pins TTL and replica count
+// together: a TTL bucket created at one replica loses its markers with one node,
+// and the usage dedupe bucket is exactly that kind of bucket.
+func TestBucket_TTLBucketIsReplicatedAcrossTheCluster(t *testing.T) {
+	const nodes = 3
+	js := startJetStreamCluster(t, nodes)
+	clustersize.RedeclareForTest(t, nodes)
+
+	bucket := kvstore.NewBucket(js, kvstore.Config{
+		Name:    "kvstore-ttl-replicated",
+		History: 1,
+		TTL:     90 * time.Minute,
+	})
+
+	// Wait for a meta leader before the one open, so a retried open cannot find a
+	// one-replica bucket from a timed-out create and raise it into a false pass.
+	var lastErr error
+	ready := assert.Eventually(t, func() bool {
+		ctx, cancel := context.WithTimeout(t.Context(), 500*time.Millisecond)
+		defer cancel()
+		_, lastErr = js.AccountInfo(ctx)
+		return lastErr == nil
+	}, 30*time.Second, 50*time.Millisecond)
+	require.True(t, ready, "JetStream cluster never elected a meta leader: %v", lastErr)
+
+	kv, err := bucket.KV(t.Context())
+	require.NoError(t, err)
+
+	status, err := kv.Status(t.Context())
+	require.NoError(t, err)
+	assert.Equal(t, 90*time.Minute, status.TTL(), "Config.TTL must reach the created bucket")
+	bucketStatus, ok := status.(*jetstream.KeyValueBucketStatus)
+	require.True(t, ok, "status is %T", status)
+	assert.Equal(t, nodes, bucketStatus.StreamInfo().Config.Replicas,
+		"a TTL bucket must be created at the cluster's replica count")
+}