-
Notifications
You must be signed in to change notification settings - Fork 296
build(deps): update linkerd2-proxy-api from 0.18.0 to 0.20.0 #4552
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,6 +103,7 @@ pub enum BackendDispatcher { | |
| Forward(SocketAddr, Arc<EndpointMetadata>), | ||
| BalanceP2c(Load, EndpointDiscovery), | ||
| Fail { message: Arc<str> }, | ||
| // TODO(kate): add a `PenaltyPeakEwma` variant here. | ||
| } | ||
|
|
||
| #[derive(Clone, Debug, Eq, Hash, PartialEq)] | ||
|
|
@@ -135,6 +136,7 @@ pub enum FailureAccrual { | |
| /// Backoff for probing the endpoint when it is in a failed state. | ||
| backoff: linkerd_exp_backoff::ExponentialBackoff, | ||
| }, | ||
| // TODO(kate): add a `Unified` variant here. | ||
| } | ||
|
|
||
| // === impl ClientPolicy === | ||
|
|
@@ -394,6 +396,9 @@ pub mod proto { | |
|
|
||
| #[error("invalid backend metadata: {0}")] | ||
| Meta(#[from] InvalidMeta), | ||
|
|
||
| #[error("penalty peak ewma mode is not yet supported")] | ||
| PenaltyPeakEwmaUnsupported, | ||
|
Comment on lines
+399
to
+401
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| } | ||
|
|
||
| #[derive(Debug, thiserror::Error)] | ||
|
|
@@ -423,6 +428,8 @@ pub mod proto { | |
| Backoff(#[from] InvalidBackoff), | ||
| #[error("missing {0}")] | ||
| Missing(&'static str), | ||
| #[error("unified failure accrual is not yet supported")] | ||
| UnifiedUnsupported, | ||
| } | ||
|
|
||
| #[derive(Debug, thiserror::Error)] | ||
|
|
@@ -667,6 +674,10 @@ pub mod proto { | |
| default_rtt: duration("peak EWMA default RTT", default_rtt)?, | ||
| decay: duration("peak EWMA decay", decay)?, | ||
| }), | ||
| balance_p2c::Load::PenaltyPeakEwma(_) => { | ||
| // TODO(kate): marshal `PenaltyPeakEwma` here. | ||
| return Err(InvalidBackend::PenaltyPeakEwmaUnsupported); | ||
| } | ||
| }; | ||
| BackendDispatcher::BalanceP2c(load, discovery) | ||
| } | ||
|
|
@@ -733,6 +744,8 @@ pub mod proto { | |
| InvalidFailureAccrual::Missing("consecutive failures backoff"), | ||
| )?, | ||
| }), | ||
| // TODO(kate): marshal `Unified` here. | ||
| failure_accrual::Kind::Unified(_) => Err(InvalidFailureAccrual::UnifiedUnsupported), | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -751,6 +764,7 @@ pub mod proto { | |
| min_backoff, | ||
| max_backoff, | ||
| jitter_ratio, | ||
| respect_retry_after_hint: _, // TODO(kate): use respect_retry_after_hint | ||
| }: outbound::ExponentialBackoff, | ||
| ) -> Result<linkerd_exp_backoff::ExponentialBackoff, InvalidBackoff> { | ||
| let min = min_backoff | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and as the description notes, i've left some
TODO(kate)comments here and elsewhere to leave breadcrumbs for when we wire this up.