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 daisy chained leaf node subject propagation issue. #2468

Merged
merged 4 commits into from Aug 25, 2021
Merged

Conversation

matthiashanel
Copy link
Contributor

shows issue #2448 and possible fix locations

Signed-off-by: Matthias Hanel mh@synadia.com

shows issue #2448

Signed-off-by: Matthias Hanel <mh@synadia.com>
@matthiashanel matthiashanel changed the title unit test showing subject propagation issue on restart NOT FOR COMMIT: unit test showing subject propagation issue on restart Aug 24, 2021
Signed-off-by: Matthias Hanel <mh@synadia.com>
…SendSubs

Signed-off-by: Matthias Hanel <mh@synadia.com>
@matthiashanel matthiashanel changed the title NOT FOR COMMIT: unit test showing subject propagation issue on restart fix daisy chained leaf node subject propagation issue. Aug 25, 2021
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 - Minor style comments etc.

server/sublist.go Outdated Show resolved Hide resolved
if sub != nil && sub.client != nil &&
(sub.client.kind == CLIENT || sub.client.kind == SYSTEM || sub.client.kind == JETSTREAM || sub.client.kind == ACCOUNT) && sub.im == nil {
(sub.client.kind == CLIENT || sub.client.kind == LEAF || sub.client.kind == SYSTEM || sub.client.kind == JETSTREAM || sub.client.kind == ACCOUNT) && sub.im == nil {
if sub.client.isSpokeLeafNode() {
Copy link
Member

Choose a reason for hiding this comment

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

Could add this above to conditional.

if (kind == LEAF && client.isSpokeLeafNode()) || ...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the isSpokeLeafNode checks for LEAF as well. so figured I don't keep the redundancy. but will add comment

Copy link
Member

@kozlovic kozlovic left a comment

Choose a reason for hiding this comment

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

LGTM - minor comment.

server/sublist.go Outdated Show resolved Hide resolved
Signed-off-by: Matthias Hanel <mh@synadia.com>
Copy link
Member

@kozlovic kozlovic left a comment

Choose a reason for hiding this comment

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

LGTM

@matthiashanel matthiashanel merged commit 41a253d into main Aug 25, 2021
@matthiashanel matthiashanel deleted the issue-2448 branch August 25, 2021 22:10
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

3 participants