Skip to content

Commit 09bc070

Browse files
authored
Merge pull request #631 from ripienaar/interest_pager_direct
Ensure direct gets are used for viewing interest streams
2 parents ccd9863 + 88ffa98 commit 09bc070

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/jedib0t/go-pretty/v6 v6.6.6
1111
github.com/klauspost/compress v1.18.0
1212
github.com/nats-io/jwt/v2 v2.7.3
13-
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220020605-cad5114b5064
13+
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220145551-7e8c334ec33e
1414
github.com/nats-io/nats.go v1.39.1
1515
github.com/nats-io/nkeys v0.4.10
1616
github.com/nats-io/nuid v1.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
3333
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
3434
github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE=
3535
github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4=
36-
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220020605-cad5114b5064 h1:4ylzrue/HOkfgV+ImULDLj7Q6EXlmdeGYQcqwcMjOoU=
37-
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220020605-cad5114b5064/go.mod h1:rx54jecOLXzMFsVMhsVcUX74wDWWAbU98zqj6gIkvOY=
36+
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220145551-7e8c334ec33e h1:vQ417szzp1N+Seq6/Ytf/9lCH6OQSw9WCCd8U8plgSk=
37+
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220145551-7e8c334ec33e/go.mod h1:rx54jecOLXzMFsVMhsVcUX74wDWWAbU98zqj6gIkvOY=
3838
github.com/nats-io/nats.go v1.39.1 h1:oTkfKBmz7W047vRxV762M67ZdXeOtUgvbBaNoQ+3PPk=
3939
github.com/nats-io/nats.go v1.39.1/go.mod h1:MgRb8oOdigA6cYpEPhXJuRVH6UE/V4jblJ2jQ27IXYM=
4040
github.com/nats-io/nkeys v0.4.10 h1:glmRrpCmYLHByYcePvnTBEAwawwapjCPMjy2huw20wc=

stream_pager.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,18 @@ func (p *StreamPager) start(stream *Stream, mgr *Manager, opts ...PagerOption) e
101101

102102
var err error
103103

104-
if p.stream.Retention() == api.WorkQueuePolicy && !p.stream.DirectAllowed() {
105-
return fmt.Errorf("work queue retention streams can only be paged if direct access is allowed")
104+
if !p.stream.DirectAllowed() {
105+
if p.stream.Retention() == api.WorkQueuePolicy {
106+
return fmt.Errorf("work queue retention streams can only be paged if direct access is allowed")
107+
}
108+
109+
if p.stream.Retention() == api.InterestPolicy {
110+
return fmt.Errorf("interest retention streams can only be paged if direct access is allowed")
111+
}
106112
}
107113

108114
// for now only on WQ because its slow, until there is a batch mode direct request
109-
p.useDirect = p.stream.Retention() == api.WorkQueuePolicy && p.stream.DirectAllowed()
115+
p.useDirect = p.stream.Retention() == api.WorkQueuePolicy || p.stream.Retention() == api.InterestPolicy
110116

111117
p.q = make(chan *nats.Msg, p.pageSize)
112118
p.sub, err = mgr.nc.ChanSubscribe(mgr.nc.NewRespInbox(), p.q)

0 commit comments

Comments
 (0)