Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix checking max deliver when backoff is used #5242

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Conversation

Jarema
Copy link
Member

@Jarema Jarema commented Mar 25, 2024

The code was just checking if max_deliver is >= than backoff, however infinite max_deliver is represented by -1, so it was erroring. This fixes that behavior.

Signed-off-by: Tomasz Pietrek tomasz@nats.io

The code was just checking if max_deliver is >= than backoff,
however infinite max_deliver is represented by -1, so it was erroring.
This fixes that behavior.

Signed-off-by: Tomasz Pietrek <tomasz@nats.io>
@Jarema Jarema requested a review from a team as a code owner March 25, 2024 16:39
Copy link
Member

@derekcollison derekcollison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@derekcollison derekcollison merged commit 75e3dcd into main Mar 25, 2024
4 checks passed
@derekcollison derekcollison deleted the fix_max_deliver branch March 25, 2024 17:04
kozlovic added a commit to nats-io/nats.c that referenced this pull request Mar 26, 2024
With PR nats-io/nats-server#5242 in server
code, not providing a MaxDeliver is considered unlimited and should
not error out. So fixing test to set MaxDeliver <= to the backoff
list to get the expected error.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
levb pushed a commit to nats-io/nats.c that referenced this pull request Mar 27, 2024
* [FIXED] Build: issue on Android with NATS_EXTRA_LIB

A user (@psantiagol) reported an issue (in #64) building on Android
due to the use of `NATS_EXTRA_LIB`. This PR skip the definition of
this variable if building on Android. Should other users then report
that this is breaking their build on Android, we will have to make
this a conditional based on a boolean build option.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>

* Fix test JetStreamBackOffRedeliveries

With PR nats-io/nats-server#5242 in server
code, not providing a MaxDeliver is considered unlimited and should
not error out. So fixing test to set MaxDeliver <= to the backoff
list to get the expected error.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>

---------

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
derekcollison added a commit that referenced this pull request Apr 4, 2024
Cherry-pick the following PRs into the v2.10.14 release branch:

* #5237
* #5238
* #5242
* #5208
* #5244
* #5248
* #5246
* #5112
* #5247
* #5256
* #5258
* #5264
* #5266
* #5267
* #5265
* #5271
* #5270
* #5272
* #5276
* #5274
* #5275
* #5277
* #5279

Signed-off-by: Neil Twigg <neil@nats.io>
levb pushed a commit to nats-io/nats.c that referenced this pull request Apr 12, 2024
* [FIXED] Build: issue on Android with NATS_EXTRA_LIB

A user (@psantiagol) reported an issue (in #64) building on Android
due to the use of `NATS_EXTRA_LIB`. This PR skip the definition of
this variable if building on Android. Should other users then report
that this is breaking their build on Android, we will have to make
this a conditional based on a boolean build option.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>

* Fix test JetStreamBackOffRedeliveries

With PR nats-io/nats-server#5242 in server
code, not providing a MaxDeliver is considered unlimited and should
not error out. So fixing test to set MaxDeliver <= to the backoff
list to get the expected error.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>

---------

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants