Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linkerd/app/core/src/disco_cache.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! A specialized `NewIdleCache` to manage discovery stae, usually from a
//! A specialized `NewIdleCache` to manage discovery state, usually from a
//! control plane client.

use futures::TryFutureExt;
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/gateway/src/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl Gateway {
self.inbound
.clone()
.with_stack(http.into_inner())
// Teminates HTTP connections.
// Terminates HTTP connections.
// XXX Sets an identity header -- this should probably not be done
// in the gateway, though the value will be stripped by meshed
// servers.
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/src/http/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl<H> Inbound<H> {
// TODO(ver) This concurrency limit applies only to
// requests that do not yet have responses, but ignores
// streaming bodies. We should change this to an
// HTTP-specific imlementation that tracks request and
// HTTP-specific implementation that tracks request and
// response bodies.
.push_on_service(svc::ConcurrencyLimitLayer::new(max_in_flight_requests))
// Shed load by failing requests when the concurrency
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/src/policy/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ where
}),

// If no discovery API is configured, then we use the
// default policy. Whlie it's a little wasteful to cache
// default policy. While it's a little wasteful to cache
// these results separately, this case isn't expected to be
// used outside of testing.
None => {
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/src/policy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ where
// policy. Send a "no results" error.
Err(grpc_no_results())
} else {
// We recieved a request that did not match the expected calls, and
// We received a request that did not match the expected calls, and
// we have no default policy. Return an error.
Err(grpc_unexpected_request())
}
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/src/tap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ impl SyncSvc {
/// Collects the given [`Body`], returning a [`Bytes`].
///
/// NB: This blocks the current thread until the provided body has been collected. This is
/// an acceptable practice in test code for the sake of simplicitly, because we will always
/// an acceptable practice in test code for the sake of simplicity, because we will always
/// provide [`SyncSvc`] with bodies that are complete.
fn collect_body<B>(body: B) -> Bytes
where
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/src/tests/profiles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl TestBuilder {
.await
.map(http_body_util::Collected::to_bytes);
let bytes = body.as_ref().map(Bytes::len);
tracing::debug!(?bytes, "recieved body");
tracing::debug!(?bytes, "received body");
Ok::<_, Error>(if fail {
Response::builder()
.status(533)
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/integration/src/tests/transparency.rs
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ macro_rules! http1_tests {
// To simplify things for this test, we just use the test TCP
// client and server to do an HTTP CONNECT.
//
// We don't *actually* perfom a new connect to requested host,
// We don't *actually* perform a new connect to requested host,
// but client doesn't need to know that for our tests.

let connect_req = b"\
Expand Down Expand Up @@ -806,7 +806,7 @@ macro_rules! http1_tests {
// To simplify things for this test, we just use the test TCP
// client and server to do an HTTP CONNECT.
//
// We don't *actually* perfom a new connect to requested host,
// We don't *actually* perform a new connect to requested host,
// but client doesn't need to know that for our tests.

let connect_req = b"\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl From<&linkerd_app_core::Error> for HttpRsp {
Ok(error) => Self::error(error),
Err(code) => http::StatusCode::from_u16(code)
.map(Self::status)
// This is kind of pathological, so mark it as an unkown error.
// This is kind of pathological, so mark it as an unknown error.
.unwrap_or_else(|_| Self::unknown()),
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ impl retry::Policy for RetryPolicy {
let attempt = if let Some(extensions::Attempt(n)) = src.get::<extensions::Attempt>() {
n.saturating_add(1)
} else {
// There was an already a first attmept (the original extensions).
// There was an already a first attempt (the original extensions).
2.try_into().unwrap()
};
dst.insert(extensions::Attempt(attempt));
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/src/http/logical/tests/timeouts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ async fn response_timeout_ignores_request_body() {
time::timeout(TIMEOUT * 4, call)
.await
.expect("should succeed")
.expect("should succed");
.expect("should succeed");
}

#[tokio::test(flavor = "current_thread", start_paused = true)]
Expand Down