Skip to content

Commit

Permalink
Revert "review comment: remove unneeded SocketAddrV6->SocketAddr wrap…
Browse files Browse the repository at this point in the history
…ping"

This reverts commit 0dcec7a.

allegedly this causes CI to fail in deploy, because it is unable to
`ipadm create-addr -t -T addrconf oxControlService%d/ll`, because the
object cannot be found. given that nothing in oximeter should run that
early, that seems odd..?
  • Loading branch information
iximeow committed Aug 15, 2024
1 parent 0dcec7a commit 3acffa4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion oximeter/collector/src/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ async fn refresh_producer_list(agent: OximeterAgent, resolver: Resolver) {
async fn resolve_nexus_with_backoff(
log: &Logger,
resolver: &Resolver,
) -> SocketAddrV6 {
) -> SocketAddr {
let log_failure = |error, delay| {
warn!(
log,
Expand All @@ -829,6 +829,7 @@ async fn resolve_nexus_with_backoff(
.lookup_socket_v6(ServiceName::Nexus)
.await
.map_err(|e| BackoffError::transient(e.to_string()))
.map(|addr| SocketAddr::V6(addr))
};
backoff::retry_notify(
backoff::retry_policy_internal_service(),
Expand Down

0 comments on commit 3acffa4

Please sign in to comment.