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

[FIXED] #2401 #2410

Merged
merged 1 commit into from Aug 4, 2021
Merged

[FIXED] #2401 #2410

merged 1 commit into from Aug 4, 2021

Conversation

derekcollison
Copy link
Member

Leafnodes with same domain and shared system account should behave like flat jetstream network.

Signed-off-by: Derek Collison derek@nats.io

Resolves #2401

/cc @nats-io/core

Leafnodes with same domain and shared system account should behave like flat jetstream network.

Signed-off-by: Derek Collison <derek@nats.io>
Copy link
Contributor

@matthiashanel matthiashanel left a comment

Choose a reason for hiding this comment

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

LGTM

@derekcollison derekcollison merged commit 2afaf1c into main Aug 4, 2021
@derekcollison derekcollison deleted the same-domain branch August 4, 2021 15:32
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 but not sure if info.Domain empty should be treated differently.

lnc := c.createLeafNodesWithTemplateAndStartPort(tmpl, "SPOKE", 3, 11311)
defer lnc.shutdown()

//lncm := c.createLeafNodesWithTemplateMixedMode(tmpl, "SPOKE", 3, 2, true)
Copy link
Member

Choose a reason for hiding this comment

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

Remove?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes will update.

@@ -1057,7 +1058,7 @@ func (c *client) processLeafnodeInfo(info *Info) {
c.Debugf("Error adding JetStream domain mapping: %v", err)
}
}
} else if hasJSDomain {
} else if hasJSDomain && opts.JetStreamDomain != info.Domain {
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to treat info.Domain possibly empty (old server?) differently here or not?

Copy link
Member Author

Choose a reason for hiding this comment

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

No for this one we want both empty or exact match.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants