Commit Graph

3227 Commits

Author SHA1 Message Date
R.I.Pienaar
ec606ebed2 add type hints num accounts message
Signed-off-by: R.I.Pienaar <rip@devco.net>
2020-10-19 12:01:11 +02:00
Derek Collison
923335e52d Merge pull request #1644 from nats-io/map
Traffic shaping and full wildcard support for streams and services exports/imports
2020-10-17 16:19:15 -07:00
Derek Collison
4af434e586 Allow mapping destinations to be parsed as singles and not force array syntax
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-17 08:21:02 -07:00
Derek Collison
cea8a0113d Use separate lock to pull cluster name for mapping
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-17 07:46:48 -07:00
Derek Collison
5f5ceb4668 Allow cluster filters for mappings, changed accountz for mappings
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-16 16:53:14 -07:00
Derek Collison
047600750a Make sure mappings to 0% turn off all traffic
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-16 14:23:47 -07:00
Derek Collison
04ffe3b00e Allow mapping destinations that introduce message loss (debugging, chaos monkey)
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-15 20:03:44 -07:00
Derek Collison
d0201d8b15 Added support for mappings in Accountz
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-15 19:14:58 -07:00
Derek Collison
4402a9cca0 Snapshot account but update at end of each readloop
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-15 15:52:43 -07:00
Derek Collison
e225acd179 Fix race accessing c.acc checking for mappings
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-15 14:02:39 -07:00
Ivan Kozlovic
e846dab45d Merge pull request #1646 from wallyqs/ws-err-typo-fix
Fix typo in websocket err message
2020-10-15 15:01:46 -06:00
Waldemar Quevedo
33a9391519 Fix typo in websocket err message
Signed-off-by: Waldemar Quevedo <wally@synadia.com>
2020-10-15 13:42:22 -07:00
Derek Collison
96bf818558 Updates based on PR feedback
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-15 13:04:04 -07:00
Ivan Kozlovic
a12a133b29 Merge pull request #1645 from nats-io/activation-revocation
[Fixed] revocation check for activations used current time instead of jet issue time
2020-10-15 13:51:05 -06:00
Matthias Hanel
2bfb8b1227 [Fixed] revocation check for activations used current time instead of jwt issue time
Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-15 15:36:50 -04:00
Derek Collison
6faf07d583 Account subject mappings and full wildcard support for exports/imports
The mappings enable traffic shaping functionality.
Also added a subject transform which can match any subject and transform to a new one, even re-ordering partial wildcards.

Signed-off-by: Derek Collison <derek@nats.io>
2020-10-15 10:26:25 -07:00
Derek Collison
93b54b230e Merge pull request #1643 from ripienaar/offset_npe
fix npe for offsets larger than items
2020-10-15 05:41:34 -07:00
R.I.Pienaar
f2106ab9e4 fix npe for offsets larger than items
Signed-off-by: R.I.Pienaar <rip@devco.net>
2020-10-15 11:27:31 +02:00
Ivan Kozlovic
fe7fd92c89 Merge pull request #1641 from nats-io/fix_gw_shadow_subs
[FIXED] Stream's subscription propagation issue with gateways
2020-10-13 19:21:24 -06:00
Ivan Kozlovic
26cd1f99ab [FIXED] Stream's subscription propagation issue with gateways
When creating shadow subscriptions for import streams, we were
not invoking code for gateway subscription accounting, which means
that when the account (for leafnodes) was switched to interest
only, those shadow subscriptions were not sent.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2020-10-13 18:10:27 -06:00
Ivan Kozlovic
99cb1fb3f0 Merge pull request #1640 from nats-io/jwt-remove
Fixed crash on non existing directory
2020-10-13 09:13:53 -06:00
Matthias Hanel
60c8cbd1f2 Fixed crash on non existing directory
Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-13 01:30:03 -04:00
Ivan Kozlovic
a4c68521ba Merge pull request #1639 from nats-io/jwt-remove
Adding list/delete/update operations for jwt stored by nats-resolver
2020-10-12 18:20:18 -06:00
Matthias Hanel
8d8f6480d7 Incorporating comments
Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-12 19:21:32 -04:00
Matthias Hanel
bb63fd5f40 Adding list/delete/update operations for jwt stored by nats-resolver
Update already existed scoped by account, this exposes update without account.
List returns a list of all stored accounts.
Delete deletes accounts.
Fix a crash on startup with non existing directory.

Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-12 18:07:07 -04:00
Waldemar Quevedo
aead978be9 Merge pull request #1638 from nats-io/revert-1637-nightly-bin-path
Revert "Update nightly image server binary path"
2020-10-10 09:37:58 -07:00
Waldemar Quevedo
1bc03cd95e Revert "Update nightly image server binary path" 2020-10-09 16:54:59 -07:00
Jaime Piña
23a56591a7 Merge pull request #1637 from nats-io/nightly-bin-path
Update nightly image server binary path
2020-10-09 15:14:35 -07:00
Jaime Piña
9f94cb5fb7 Update nightly image server binary path
Currently, the NATS operator doesn't work with the nightly NATS Server images because binary is in a different location. This symlinks the binary to a few different known paths.
2020-10-09 14:44:07 -07:00
Ivan Kozlovic
fec5b7fdef Merge pull request #1635 from nats-io/sys-acc-rev-fix
Skip revocation check if the client has no jwt and is therefore internal
2020-10-09 12:57:15 -06:00
Matthias Hanel
db44b589fc Skip revocation check if the client has no jwt and is therefore internal
Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-09 14:41:32 -04:00
Ivan Kozlovic
618cde9039 Merge pull request #1634 from nats-io/warn_duplicate_server_name
Accepting route warns if remote server has same name
2020-10-09 10:19:40 -06:00
Ivan Kozlovic
13df1a55fd Changed warning message
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2020-10-09 09:36:30 -06:00
Ivan Kozlovic
df9d5f5fd9 Accepting route warns if remote server has same name
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2020-10-08 17:59:33 -06:00
Ivan Kozlovic
b6d2c9ff64 Merge pull request #1633 from nats-io/change_tls_and_aut_default_timeout
[CHANGED] Default TLS and Auth timeout
2020-10-08 16:40:43 -06:00
Ivan Kozlovic
9b6385d6e7 [CHANGED] Default TLS and Auth timeout
The default TLS timeout has been bumped to 2 seconds.
The default Auth timeout is now 2 seconds, but if TLS config
is present, it is equal to TLS timeout (possibly default value) + 1s.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2020-10-08 16:15:30 -06:00
Ivan Kozlovic
5ad31022e2 Merge pull request #1632 from nats-io/expiration
[Fixed] revocation check used current time instead of jwt issue time
2020-10-07 08:52:39 -06:00
Matthias Hanel
387e1e1ee4 [Fixed] revocation check used current time instead of jwt issue time
Also empty revoked keys once account jwt has no revocations.

Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-06 21:45:34 -04:00
Ivan Kozlovic
f9bff10226 Merge pull request #1629 from nats-io/conns
Avoid unnecessary CONNS subscription
2020-10-05 16:38:00 -06:00
Matthias Hanel
4ff7b280f4 Avoid unnecessary CONNS subscription
Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-10-05 18:25:51 -04:00
Ivan Kozlovic
6da5d2f490 Merge pull request #1628 from nats-io/ack_explicit_msg_removal
AckExplicit removes message for "offline" durable
2020-10-02 17:41:11 -06:00
Derek Collison
cdfb7ba03b Remove delivery count check, could flap
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-02 16:30:40 -07:00
Derek Collison
9ad408e0b3 Use closed variable on consumer, don't check consumer sequences
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-02 16:21:23 -07:00
Derek Collison
8a9f6eaf42 Additional fixes to interest retention based streams and offline durables with redelivery.
Signed-off-by: Derek Collison <derek@nats.io>
2020-10-02 12:58:59 -07:00
Derek Collison
a75be04b0a Various fixes for this PR.
- Fix for updating delivery subject and adjusting next delivery sequences.
- When acking explicitly but out of order, need to make sure we set floor correctly.
- Only update ack floors on an ack if the message is present.
- Fix for needAck for explicitAck out of order consumers detecting if message has been acked.
- Fix for race not locking stream when checking interest during stop.
- Fix for filestore determing if a message block still has a message. Added check to first sequence as well as cache.
- Some additions to the original test.

Signed-off-by: Derek Collison <derek@nats.io>
2020-10-01 21:24:40 -07:00
Ivan Kozlovic
eff27e26be AckExplicit removes message for "offline" durable
The test shows the issue.
It seems that Consumer.needAck() for AckExplicit should consider
that an Ack is needed if sseq > o.asflr and there is no pending
ack at all. However making this change would break the test
TestJetStreamInterestRetentionStream.

Also, running the new test with `-count 100` and by adding an
artificial delay in stream.ackMsg() (just before calling
mset.store.RemoveMsg(seq)) causes sometimes delete requests
for the same sequence to be processed twice, which causes
the new test to fail (even with an attempted fix as discussed
above). I think that the attempt to remove the same sequence twice
is messing up the state.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2020-10-01 12:22:02 -06:00
Ivan Kozlovic
8989fb6524 Merge pull request #1625 from nats-io/bump_version
Bump version
2020-09-29 19:25:46 -06:00
Ivan Kozlovic
7b03edb792 Bump version
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
2020-09-29 19:23:12 -06:00
Ivan Kozlovic
82867229e0 Merge pull request #1624 from nats-io/bad-jwt
Updated jwt library and check (account & token) issuer prior to jwt Validate
2020-09-29 19:21:18 -06:00
Matthias Hanel
08e37e0d94 Updated jwt library and check (account/token) issuer prior to jwt Validate
Signed-off-by: Matthias Hanel <mh@synadia.com>
2020-09-29 21:03:40 -04:00