Skip to content

pull in dendrite PR 220#9898

Merged
rcgoodfellow merged 5 commits intomainfrom
ry/dendrite-220
Mar 2, 2026
Merged

pull in dendrite PR 220#9898
rcgoodfellow merged 5 commits intomainfrom
ry/dendrite-220

Conversation

@rcgoodfellow
Copy link
Contributor

@rcgoodfellow rcgoodfellow commented Feb 22, 2026

@rcgoodfellow rcgoodfellow marked this pull request as ready for review February 27, 2026 23:14
@rcgoodfellow rcgoodfellow force-pushed the ry/dendrite-220 branch 2 times, most recently from 5c4369d to 04d9c02 Compare February 28, 2026 00:17
zeeshanlakhani added a commit that referenced this pull request Mar 2, 2026
This includes a few changes I was already working on in relation to
#9898. This comes after testing with
a feature-gated (for multicast) dpd binary. 

There's a minor follow-up (oxidecomputer/dendrite#232) that I'll work in after this. 

- Use actual group tags from DPD responses instead of hardcoded "nexus"
- Rename IntoUnderlayMulticastIpv6 -> IntoUnderlayMulticast (shorter), fits trait definition / more accurate
- Pass MulticastTag as parameter to dpd_update_external_or_create
- Use existing_tag.try_into() / current_tag.try_into() for tag usage
- Nit: dpd_state_matches_tag to use as_str() comparison
- Fix: IpSrc::Subnet -> IpSrc::Any (new dendrite API)
- Fix: SwitchLocation import (moved to sled_agent_types)
- Remove unused multicast type imports
Copy link
Collaborator

@zeeshanlakhani zeeshanlakhani left a comment

Choose a reason for hiding this comment

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

For the multicast-side, as I've been running those tests against an actual feature-built DPD binary, so I put up a PR against your work @rcgoodfellow #9950. I hope that's ok.

This includes a few changes I was already working on in relation to
#9898. This comes after
testing with a feature-gated (for multicast) dpd binary.

There's a minor follow-up
(oxidecomputer/dendrite#232) that I'll work in
after this.

- Use actual group tags from DPD responses instead of hardcoded "nexus"
- Rename IntoUnderlayMulticastIpv6 -> IntoUnderlayMulticast (shorter),
fits trait definition / more accurate
- Pass MulticastTag as parameter to dpd_update_external_or_create
- Use existing_tag.try_into() / current_tag.try_into() for tag usage
- Nit: dpd_state_matches_tag to use as_str() comparison
- Fix: IpSrc::Subnet -> IpSrc::Any (new dendrite API)
- Fix: SwitchLocation import (moved to sled_agent_types)
- Remove unused multicast type imports
// tokio_postgres::config::Config parser to include in the error
// message.
let error = "foo".parse::<PostgresConfigWithUrl>().unwrap_err();
assert!(error.to_string().contains("unexpected EOF"));
Copy link
Collaborator

Choose a reason for hiding this comment

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

Your change here seems totally reasonable to me; invalid connection string is describing the situation here accurately, and I don't think "unexpected EOF" even described the condition we were looking for before. It just happened to be the string emitted by the old postgres version.

@rcgoodfellow rcgoodfellow merged commit 328ba48 into main Mar 2, 2026
18 checks passed
@rcgoodfellow rcgoodfellow deleted the ry/dendrite-220 branch March 2, 2026 19:34
@smklein smklein mentioned this pull request Mar 2, 2026
smklein added a commit that referenced this pull request Mar 3, 2026
Fixing a conflict between
#9898 and
#9878

(New tests + new postgres -> changes how error messages got exposed)
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.

3 participants