fix(pubsub/v2): respect ShutdownBehavior when handling timeout (#13021)

kurochan · web-flow · commit 0135d9305581 · 2025-10-03T13:40:25.000-04:00
Previously, `ShutdownOptions.Behavior` was never respected — when a positive `Timeout` was set, messages were always nacked. This PR fixes the shutdown logic so that messages are only nacked if `Behavior` is explicitly set to `ShutdownBehaviorNackImmediately`. This makes the `Behavior` field effective as intended. related to #12829
diff --git a/pubsub/v2/subscriber.go b/pubsub/v2/subscriber.go
@@ -481,8 +481,10 @@ func (s *Subscriber) Receive(ctx context.Context, f func(context.Context, *Messa
 				p.iter.ps.cancel()
 			}
 			time.AfterFunc(shutdownOpts.Timeout, shutdownKillCancel)
-			for _, p := range pairs {
-				p.iter.nackInventory(shutdownKillCtx)
+			if shutdownOpts.Behavior == ShutdownBehaviorNackImmediately {
+				for _, p := range pairs {
+					p.iter.nackInventory(shutdownKillCtx)
+				}
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -481,8 +481,10 @@ func (s Subscriber) Receive(ctx context.Context, f func(context.Context, Messa`
`481`	`481`	`p.iter.ps.cancel()`
`482`	`482`	`}`
`483`	`483`	`time.AfterFunc(shutdownOpts.Timeout, shutdownKillCancel)`
`484`		`- for _, p := range pairs {`
`485`		`- p.iter.nackInventory(shutdownKillCtx)`
	`484`	`+ if shutdownOpts.Behavior == ShutdownBehaviorNackImmediately {`
	`485`	`+ for _, p := range pairs {`
	`486`	`+ p.iter.nackInventory(shutdownKillCtx)`
	`487`	`+ }`
`486`	`488`	`}`
`487`	`489`	`}`
`488`	`490`