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

Release v2.10.8 cherry picks #4887

Merged
merged 14 commits into from
Dec 15, 2023
Merged

Release v2.10.8 cherry picks #4887

merged 14 commits into from
Dec 15, 2023

Conversation

svenfoo and others added 11 commits December 15, 2023 08:31
Closes #4826

Signed-off-by: Sven Neumann <sven.neumann@holoplot.com>
Move matching of filter subject on stream purge to the consumer
and add a unit test for it.

Signed-off-by: Sven Neumann <sven.neumann@holoplot.com>
Signed-off-by: Sven Neumann <sven.neumann@holoplot.com>
We do not always need the tokenized subject here.

Signed-off-by: Sven Neumann <sven.neumann@holoplot.com>
Signed-off-by: Sven Neumann <sven.neumann@holoplot.com>
…lowly back off retries til we hit maximum of 2m.

Signed-off-by: Derek Collison <derek@nats.io>
…uests.

This was due to the fact the the request was for an R1 consumer with a wildcard filter subject on a large subject space.
This will be properly handled in a subsequent PR with a replacement for PSIM and calculating NumPending on a stream.

For now, we are doing several changes in this CL.

1. Warn if the internal queue starts to back up past a limit (32 atm).
2. Use multiple Go routines in a pool to process on the other side.
3. Make sure to track inflight properly. We exposed it as an api usage stat for JetStream, but were not properly tracking.

Signed-off-by: Derek Collison <derek@nats.io>
Signed-off-by: Derek Collison <derek@nats.io>
Signed-off-by: Derek Collison <derek@nats.io>
…rrors and sources after when we receive a response.

Also cancel on a timeout since the consumer, even if created after, is of no use to us at this point.

Signed-off-by: Derek Collison <derek@nats.io>
…ent.

This was causing us to load all blocks to calulate NumPending for a new consumer with LastBySubject delivery.

Note this will be drastically improved with stree(ART) in a later PR.

Signed-off-by: Derek Collison <derek@nats.io>
@wallyqs wallyqs requested a review from a team as a code owner December 15, 2023 16:34
@wallyqs wallyqs requested a review from bruth December 15, 2023 16:35
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

Signed-off-by: Derek Collison <derek@nats.io>
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

philpennock and others added 2 commits December 15, 2023 14:45
This does not add tests or docs, this is to sound out how people feel about the
API.

Turn the TLS options cert_file and key_file into list-separated paths (so
colon-delimited if on Unix, like `$PATH`); the count of entries must match, and
the keys and certs should zip together.

With this change, TLS SNI works to pick the correct cert to return for a given
connection, allowing a NATS server to have multiple identities.
```
tls {
  certs = [
    {
      cert_file: "./configs/certs/srva-cert.pem"
      key_file:  "./configs/certs/srva-key.pem"
    },
    {
      cert_file: "./configs/certs/srvb-cert.pem"
      key_file:  "./configs/certs/srvb-key.pem"
    }
  ]
  ca_file: "./configs/certs/ca.pem"
  verify:  true
  timeout: 2
}
```

Signed-off-by: Waldemar Quevedo <wally@nats.io>
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

@wallyqs wallyqs merged commit 218cbac into release/v2.10.8 Dec 15, 2023
3 of 4 checks passed
@wallyqs wallyqs deleted the downstream/v2.10.8 branch December 15, 2023 23:02
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

4 participants