Commit Graph

4291 Commits

Author SHA1 Message Date
Derek Collison
395728bab9 Allow control messages like heartbeats to pass the old sub test.
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-14 14:11:02 -07:00
Derek Collison
ee1775c667 Merge pull request #2111 from nats-io/peers
Add in more extensive test on extending hubs with leafnode clusters
2021-04-14 10:48:48 -07:00
Derek Collison
2ef2473582 Merge pull request #2113 from nats-io/mirrors
Make sure to stop unneeded retries for mirror consumers.
2021-04-14 10:46:50 -07:00
Derek Collison
627d20f7d4 Make sure to stop retries for mirror consumers when not leader and through old control messages.
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-14 10:43:55 -07:00
Derek Collison
1127c5d771 Bump Version
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-13 20:08:29 -07:00
Derek Collison
6ca6db70b2 Add in more extensive test on extending hubs with leafnode clusters
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-13 19:55:41 -07:00
Derek Collison
f1e16fa796 Merge pull request #2110 from nats-io/mirror_expire
Mirrors failed when upstream messages had expired.
2021-04-13 12:31:02 -07:00
Derek Collison
f6a82a7c98 When messages were no longer available in an upstream stream a mirror could wedge and not resolve.
This fixes that scenario by detecting the situation and inserting skip msgs to catch up.

Signed-off-by: Derek Collison <derek@nats.io>
2021-04-13 11:46:03 -07:00
Derek Collison
5696358494 Merge pull request #2109 from nats-io/deleted_details
Change to report total deleted by default for stream info.
2021-04-13 07:54:32 -07:00
Derek Collison
90989d57d6 Change to report total deleted by default for stream info.
Allow deleted details if requested.

Signed-off-by: Derek Collison <derek@nats.io>
2021-04-12 18:10:11 -07:00
Derek Collison
6788c757d1 Merge pull request #2108 from nats-io/lnjs
Improve JS when a leafnode cluster extends and shares a system account.
2021-04-12 17:24:13 -07:00
Matthias Hanel
9486722e96 [fixing] subscription issue when subscribing to a super set of deny_import
If the subscription was foo. > but the server also had an import deny of foo.bar
It was legal to send the subscription. But the other server was unaware
of the restriction and sent the message anyway. The check of the
incoming message did not happen.

Fixing by ignoring messages the server is not supposed to receive.
And exchange deny_import so that the non soliciting leaf node knows to not
send these messages in the first place.

NB. merging of deny_ export/import with perms from INFO happens in processLeafnodeInfo

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-04-12 20:09:55 -04:00
Derek Collison
755ef74855 When a cluser of leafnodes connects to a cluster or supercluster hub and they share the system account make the leafnode servers observers.
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-12 17:00:55 -07:00
Derek Collison
8645935ccd Bump version
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-12 11:43:11 -07:00
Derek Collison
e00cbf4927 Merge pull request #2105 from nats-io/interest_delete
Pull based consumers when deleted were not removing messages from an interest retention stream.
2021-04-12 11:41:37 -07:00
Derek Collison
c63f1d78b2 Merge pull request #2104 from nats-io/pbug2
Make sure we do not set last to -1
2021-04-12 11:19:09 -07:00
Derek Collison
f893345b40 Pull based consumers when deleted were not removing messages from an interest based stream.
Fix for #2097.

Signed-off-by: Derek Collison <derek@nats.io>
2021-04-12 11:16:31 -07:00
Derek Collison
bbb03af442 Make sure we do not set last to -1. #2068
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-12 11:01:41 -07:00
Waldemar Quevedo
a7db58c899 Merge pull request #2103 from wallyqs/sigterm-fix
Make TERM exit 1 as pre v2.2 series
2021-04-12 10:54:50 -07:00
Waldemar Quevedo
8daf6e4995 Make SIGTERM exit 1
Before 2.2 series, the TERM signal used to not be handled
by the server, so it would not have been a clean exit.
In 2.2, it was changed to process TERM signal as a clean exit
but this affects the behavior of some tools that were expecting
TERM to be exit 1.

Signed-off-by: Waldemar Quevedo <wally@synadia.com>
2021-04-12 10:17:13 -07:00
Ivan Kozlovic
9d8ea6b64a Merge pull request #2102 from nats-io/fix_leafnode_flapper
Fixed leafnode flapper
2021-04-12 09:59:36 -06:00
Derek Collison
66b0c5c216 Merge pull request #2100 from nats-io/csz
Only adjust cluster size when we have heard from all peers.
2021-04-12 08:52:07 -07:00
Derek Collison
cb55e163a5 Merge pull request #2098 from nats-io/mixedmode
Add mixedmode test back in
2021-04-12 08:48:43 -07:00
Ivan Kozlovic
c369a26c03 Fixed leafnode flapper
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2021-04-12 09:31:33 -06:00
Derek Collison
32734960ed Merge pull request #2099 from nats-io/pbug
Partial fix for #2068
2021-04-11 10:46:48 -07:00
Derek Collison
0cee993e3b When checking cluster size we need to make sure we have heard from all peers before making adjustments.
Also check back periodically.

Signed-off-by: Derek Collison <derek@nats.io>
2021-04-10 15:55:51 -07:00
Derek Collison
e0eaf704dc Partial fix for #2068.
This will not protect against the index file being completely removed.

Signed-off-by: Derek Collison <derek@nats.io>
2021-04-10 12:46:31 -07:00
Derek Collison
2bc4bf19a7 Make sure to clean up directories
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-10 10:25:12 -07:00
Derek Collison
833279388b Add mixedmode test back in
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-10 10:10:37 -07:00
Derek Collison
69269c5653 Merge pull request #2095 from nats-io/mixed
Mixed mode improvements.
2021-04-09 16:56:41 -07:00
Derek Collison
27d8b939b5 Updated based on comments that the one fix was actually a misconfiguration.
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-09 16:49:24 -07:00
Ivan Kozlovic
948d69ae7d Merge pull request #2096 from nats-io/gofmt-s
Run gofmt -s to simplify code
2021-04-09 17:27:39 -06:00
Jaime Piña
27e9628c3a Run gofmt -s to simplify code 2021-04-09 15:18:06 -07:00
Derek Collison
e438d2f5fa Mixed mode improvements.
1. When in mixed mode and only running the global account we now will check the account for JS.
2. Added code to decrease the cluster set size if we guessed wrong in mixed mode setup.

Signed-off-by: Derek Collison <derek@nats.io>
2021-04-09 14:58:35 -07:00
Matthias Hanel
da4430fc8d using clearTimer(&c.ping.tmr) for cleanup
Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-04-09 16:53:06 -04:00
Matthias Hanel
f7a772f097 Ensure that leafNodeFinishConnectProcess is only executed once.
incorporate review comments

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-04-09 16:53:06 -04:00
Matthias Hanel
5d1f36dd17 [Fixed] leaf node subscription permission negotiation.
On connect all subscription where sent by the soliciting leaf node.
If creds contains sub deny permissions, the leaf node would be
disconnected.
This waits for the permissions to be exchanged and checks permissions
before sending subscriptions.

Signed-off-by: Matthias Hanel <mh@synadia.com>
2021-04-09 16:53:06 -04:00
Derek Collison
112257d09d Merge pull request #2089 from nats-io/flappers
Fix flappers
2021-04-09 08:54:24 -07:00
Derek Collison
3c051d461c Fix flappers
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-08 18:03:14 -07:00
Ivan Kozlovic
6fef6456e8 Merge pull request #2088 from nats-io/fix_leafnode_first_ping
[FIXED] LeafNode: set first ping timer after receiving CONNECT
2021-04-08 17:53:06 -06:00
Ivan Kozlovic
666eea5b95 Merge pull request #2087 from nats-io/fix_tmp_pid_file
Fixed expected pid path in options
2021-04-08 16:10:04 -06:00
Derek Collison
1c368973c8 Merge pull request #2086 from alexpantyukhin/fix_max_bytes_check_memstore
fix for memstore storeRawMsg be consistent with filestore
2021-04-08 14:48:56 -07:00
Ivan Kozlovic
a7e5853a3c Fixed expected pid path in options
This was introduced by PR #2071.

On some tests, options are loaded based on a config file that has
the pid set to "/tm/nats-server/nats-server.pid", however, the
expected option's pid path was set based on tmpRoot. The problem
is that on macOS, that value would be "/var/folders/xxx" which
would not match.
So this PR simply reverts the changes to the expected pid file
name: it simply needs to match was in the test.conf file.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2021-04-08 15:08:23 -06:00
Ivan Kozlovic
452685b9b1 [FIXED] LeafNode: set first ping timer after receiving CONNECT
We were setting the ping timer in the accepting server as soon
as the leafnode connection is created, just after sending
the INFO and setting the auth timer.

Sending a PING too soon may cause the solicit side to process
this PING and send a PONG in response, possibly before sending
the CONNECT, which the accepting side would fail as an authentication
error, since first protocol is expected to be a CONNECT.

Since LeafNode always expect a CONNECT, we always set the auth
timer. So now on accept, instead of starting the ping timer just
after sending the INFO, we will delay setting this timer only
after receiving the CONNECT.

The auth timer will take care of a stale connection in the time
it takes to receives the CONNECT.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2021-04-08 14:36:39 -06:00
alexpantyukhin
ce34266912 fix for memstore storeRawMsg be consistent with filestore 2021-04-08 23:54:10 +04:00
Derek Collison
7030b0eb46 Merge pull request #2085 from nats-io/ack_pending
Fix for #2083
2021-04-08 12:31:35 -07:00
Derek Collison
deb015ec73 Fix for #2083 to release ack pending when messages expire or hit max redeliveries.
Signed-off-by: Derek Collison <derek@nats.io>
2021-04-08 11:47:59 -07:00
Ivan Kozlovic
36e18c20ff Merge pull request #2084 from ripienaar/client_auth_kind
expose the connection kind to CustomClientAuthentication
2021-04-08 10:55:33 -06:00
R.I.Pienaar
f2d1a173db expose the connection kind to CustomClientAuthentication
Signed-off-by: R.I.Pienaar <rip@devco.net>
2021-04-08 18:33:55 +02:00
Ivan Kozlovic
c7f8296a85 Merge pull request #2065 from alexpantyukhin/extract_server_update
extract_server_update
2021-04-08 09:01:51 -06:00