Commit Graph

4578 Commits

Author SHA1 Message Date
Derek Collison
326a377b3e When leader changes happened to streams that mirrored or sourced other streams we could continue to try to create consumers.
This could get excessive on a stream that has sourced many upstream origin streams and had several leader changes.

Signed-off-by: Derek Collison <derek@nats.io>
2021-06-10 19:47:46 -07:00
Derek Collison
ae1202903c 2.3.0-beta.4
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-10 14:51:06 -07:00
Derek Collison
afbb8bf4c8 Merge pull request #2278 from nats-io/gr_hdrs
[FIXED] Headers were lost from a response across a GW and through a route.
2021-06-10 14:50:16 -07:00
Derek Collison
1270977322 When receiving a response across a gateway that has headers and a globally routed subject (_GR_) we were dropping header information.
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-10 14:29:33 -07:00
Waldemar Quevedo
9013527024 Merge pull request #2277 from nats-io/ocsp-more-config
ocsp: add more config options to customize OCSP
2021-06-10 11:43:23 -07:00
Derek Collison
00bfc1f0ae Merge pull request #2276 from nats-io/active_servers
Added active servers to statsz.
2021-06-10 11:01:29 -07:00
Waldemar Quevedo
60499e2749 ocsp: add more config options to customize ocsp stapling
Signed-off-by: Waldemar Quevedo <wally@synadia.com>
2021-06-10 10:48:51 -07:00
Derek Collison
637973a1c7 fomatting
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-10 10:04:41 -07:00
Derek Collison
4965a5c494 Merge branch 'master' into active_servers 2021-06-10 09:57:55 -07:00
Matthias Hanel
83389db226 [fixed] hanging leaf node connection when account can't be found (#2267)
* [fixed] hanging leaf node connection when account can't be found

as a result of the issue, the leaf node connection never got created,
even after the account can be found.

Also tracing account id and name (when available)

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-06-10 11:55:16 -04:00
Matthias Hanel
2caf2303f2 [adding] jetstream info to statsz (#2269)
* [adding] jetstream info to statsz

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-06-10 11:54:56 -04:00
Derek Collison
5f93ca09cd Bumped memory ceiling
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-10 07:28:20 -07:00
Derek Collison
cc63915f54 Added active servers to statsz.
This is generally useful but will also help with cli actions since we know from first response how many total responses are expected.

Signed-off-by: Derek Collison <derek@nats.io>
2021-06-09 19:14:37 -07:00
Derek Collison
be9fb5f6f2 2.3.0-beta.2
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-09 17:08:33 -07:00
Derek Collison
3626668025 Merge pull request #2275 from nats-io/pull_gw
[FIXED] Handling of subject rewrites for subjects to a globally routed subject.
2021-06-09 17:07:43 -07:00
Ivan Kozlovic
14d3cc6b03 Merge pull request #2274 from nats-io/fix_2273
[FIXED] LeafNode config reload failed without any change made
2021-06-09 16:47:08 -06:00
Derek Collison
e238512285 Handling of rewrites for subjects to a globally routed subject was not properly handling c.pa.deliver or reply rewrite.
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-09 15:34:47 -07:00
Ivan Kozlovic
c45f4f0353 [FIXED] LeafNode config reload failed without any change made
Issuing a configuration reload for a leafnode that has remotes
defined with remotes having more than 1 url could lead to a failure.
This is because we have introduced shuffling of remote urls but
that was done in the server's options object, which then would
cause the DeepEqual when diff'ing options to fail.
We move the suffling to the private list of urls.

The other issue was that the "old" remote option may not have
had a local account and it was not set to "$G", which could make
the DeepEqual fail.

Resolves #2273

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2021-06-09 16:12:39 -06:00
Derek Collison
eec9cb849e Bump version
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-09 08:15:02 -07:00
Waldemar Quevedo
297b55c9a9 Merge pull request #2263 from nats-io/ocsp-cluster-leaf-gw
ocsp: Add OCSP Stapling support for cluster, gateway and leafnodes
2021-06-08 18:07:37 -07:00
Jaime Piña
6c992199ae ocsp: Add OCSP Stapling support for cluster, gateway and leafnodes
Signed-off-by: Waldemar Quevedo <wally@synadia.com>
Signed-off-by: Jaime Piña <jaime@synadia.com>
2021-06-08 16:53:42 -07:00
Ivan Kozlovic
8a712daf8f Merge pull request #2268 from nats-io/fix_2265
[FIXED] MQTT: panic when using import/export
2021-06-08 16:07:43 -06:00
Ivan Kozlovic
308be7ecd3 [FIXED] MQTT: panic when using import/export
The issue was that the subscription created for the MQTT client
was resulting in creation of a shadow subscription which did not
have the mqtt specific object attached, which would cause the
panic when accessing it in the sub's icb.

After that, it was discovered that the wrong subject was passed
to deliverMsg(), so fixed that too so that the icb callback gets
the proper transformed subject.

Resolves #2265

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2021-06-08 15:03:12 -06:00
R.I.Pienaar
376b60d297 Merge pull request #2266 from ripienaar/stream_add_err
ensure correct error handling in non clustered stream add
2021-06-08 15:06:32 +02:00
R.I.Pienaar
470969d1b3 ensure correct error handling in non clustered stream add
The addStream() can return an ApiErr but we did not handle
that leading to errors like 'stream name already in use (10058)' instead
of just 'stream name already in use' with the correct error code 10058 set

Signed-off-by: R.I.Pienaar <rip@devco.net>
2021-06-08 13:38:00 +02:00
Derek Collison
59b27a7a7a Merge pull request #2261 from nats-io/leaf_fixups
Changes to leafnodes and JetStream
2021-06-07 09:11:51 -07:00
Derek Collison
30fae4f960 Changes to leafnodes to support multiple domains where the hub is JetStream enabled but the hub account is not, and the leafnode is.
We were incorrectly shutting things down via deny clauses when detecting the remote side/hub had JetStream capabilities.
This change moves that logic to the remote side and is signalled off the connect message which let's the remote side know
if the local leafnode account has JetStream enabled.

Signed-off-by: Derek Collison <derek@nats.io>
2021-06-07 08:39:11 -07:00
Derek Collison
3ab2a1eb9b Merge pull request #2260 from nats-io/remove_ps_macosx
Remove external dependency on 'ps' for memory and cpu usage.
2021-06-07 08:05:46 -07:00
Derek Collison
361af54f51 Remove external dependency on 'ps' for memory and cpu usage.
Signed-off-by: Derek Collison <derek@nats.io>
2021-06-06 11:13:32 -07:00
R.I.Pienaar
82eb6b6d5e Merge pull request #2255 from ripienaar/error_updates
Minor updates to error data
2021-05-28 16:30:16 +02:00
R.I.Pienaar
7088510188 Minor updates to error data
Signed-off-by: R.I.Pienaar <rip@devco.net>
2021-05-28 15:52:22 +02:00
Waldemar Quevedo
f89d06190c Merge pull request #2240 from nats-io/ocsp-caching
OCSP Stapling
2021-05-26 15:21:14 -07:00
Waldemar Quevedo
d78a91836b ocsp: Add caching staples to disk to store dir
Signed-off-by: Waldemar Quevedo <wally@synadia.com>
2021-05-26 15:04:05 -07:00
R.I.Pienaar
6600947266 Merge pull request #2168 from ripienaar/richer_api_errors
richer api errors proposal
2021-05-26 18:12:06 +02:00
R.I.Pienaar
639d07bca4 typo fix, report highest number
Signed-off-by: R.I.Pienaar <rip@devco.net>
2021-05-26 17:30:31 +02:00
R.I.Pienaar
ee9d10f40b restore old error constants for backwards compat
Signed-off-by: R.I.Pienaar <rip@devco.net>
2021-05-26 08:04:50 +02:00
R.I.Pienaar
0d391b02eb richer api errors proposal
Signed-off-by: R.I.Pienaar <rip@devco.net>
2021-05-26 08:04:50 +02:00
Ivan Kozlovic
cf433ae007 Merge pull request #2250 from nats-io/release_2_2_6
Release v2.2.6
v2.2.6
2021-05-24 15:55:26 -06:00
Ivan Kozlovic
1c00f77bc5 Release v2.2.6
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2021-05-24 15:42:15 -06:00
Matthias Hanel
b1dee292e6 [changed] pinned certs to check the server connected to as well (#2247)
* [changed] pinned certs to check the server connected to as well

on reload clients with removed pinned certs will be disconnected.
The check happens only on tls handshake now.

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-05-24 17:28:32 -04:00
Derek Collison
f5c3da32ff Merge pull request #2249 from nats-io/varz-js
Fix for varz JetStream usage showing total account usage vs server usage.
2021-05-24 14:11:10 -07:00
Derek Collison
0d6b022780 Fix for varz JetStream usage showing total account usage vs server usage.
Signed-off-by: Derek Collison <derek@nats.io>
2021-05-24 14:05:42 -07:00
Matthias Hanel
252558caaa Merge pull request #2248 from nats-io/js-mappings
[fixed] deletion of js mappings on account jwt update
2021-05-24 16:53:42 -04:00
Matthias Hanel
748b7c32f4 [fixed] deletion of js mappings on account jwt update
fixed by moving setting of the mappings into a common function that is
also called when the jwt is updated

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-05-24 16:44:14 -04:00
Jaime Piña
b2e1ff7a7c Add OCSP support
Signed-off-by: Waldemar Quevedo <wally@synadia.com>
2021-05-24 10:52:27 -07:00
Jaime Piña
0072107110 Vendor ocsp dep 2021-05-24 10:52:27 -07:00
Derek Collison
9d867889ca Merge pull request #2246 from nats-io/wq-retention
Fix for #2243. We were not allowing replicated acks processing for work queues.
2021-05-24 10:01:04 -07:00
Derek Collison
8888ab51f4 Fix for #2243. We were not allowing replicated acks processing for workqueues properly, only interest retention.
Signed-off-by: Derek Collison <derek@nats.io>
2021-05-24 09:53:31 -07:00
Derek Collison
11539ecdd7 Merge pull request #2245 from nats-io/msgid
[FIXED] #2242.
2021-05-24 09:29:43 -07:00
Derek Collison
8f2457fd30 Merge branch 'master' into msgid 2021-05-24 09:22:35 -07:00