Rename Stack::push_cache to push_idle_cache (#2119)

Follow-up from 5d0b226 (#2118)
linkerd · Jan 5, 2023 · b1be983 · b1be983
1 parent 5d0b226
commit b1be983
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/linkerd/app/core/src/svc.rs b/linkerd/app/core/src/svc.rs
@@ -222,7 +222,7 @@ impl<S> Stack<S> {
         self.push_on_service(buffer(name, config))
     }
 
-    pub fn push_cache<T>(self, idle: Duration) -> Stack<idle_cache::NewIdleCached<T, S>>
+    pub fn push_idle_cache<T>(self, idle: Duration) -> Stack<idle_cache::NewIdleCached<T, S>>
     where
         T: Clone + Eq + std::fmt::Debug + std::hash::Hash + Send + Sync + 'static,
         S: NewService<T> + 'static,

diff --git a/linkerd/app/gateway/src/lib.rs b/linkerd/app/gateway/src/lib.rs
@@ -154,7 +154,7 @@ where
                 )
                 .push_buffer("TCP Gateway", &outbound.config().tcp_connection_buffer),
         )
-        .push_cache(outbound.config().discovery_idle_timeout)
+        .push_idle_cache(outbound.config().discovery_idle_timeout)
         .check_new_service::<NameAddr, I>();
 
     // Cache an HTTP gateway service for each destination and HTTP version.
@@ -188,7 +188,7 @@ where
                 )
                 .push_buffer("Gateway", &inbound_config.http_request_buffer),
         )
-        .push_cache(inbound_config.discovery_idle_timeout)
+        .push_idle_cache(inbound_config.discovery_idle_timeout)
         .push_on_service(
             svc::layers()
                 .push(http::Retain::layer())

diff --git a/linkerd/app/inbound/src/http/router.rs b/linkerd/app/inbound/src/http/router.rs
@@ -207,7 +207,7 @@ impl<C> Inbound<C> {
                         .push(rt.metrics.proxy.stack.layer(stack_labels("http", "logical")))
                         .push_buffer("HTTP Logical", &config.http_request_buffer),
                 )
-                .push_cache(config.discovery_idle_timeout)
+                .push_idle_cache(config.discovery_idle_timeout)
                 .push_on_service(
                     svc::layers()
                         .push(http::Retain::layer())

diff --git a/linkerd/app/outbound/src/discover.rs b/linkerd/app/outbound/src/discover.rs
@@ -60,7 +60,7 @@ impl<N> Outbound<N> {
                         )
                         .push_buffer("TCP Server", &config.tcp_connection_buffer),
                 )
-                .push_cache(config.discovery_idle_timeout)
+                .push_idle_cache(config.discovery_idle_timeout)
                 .push(svc::ArcNewService::layer())
                 .check_new_service::<T, I>()
         })

diff --git a/linkerd/app/outbound/src/http/logical.rs b/linkerd/app/outbound/src/http/logical.rs
@@ -53,7 +53,7 @@ impl<N> Outbound<N> {
                         .push_buffer("HTTP Logical", http_request_buffer),
                 )
                 // TODO(ver) this should not be a generalized time-based evicting cache.
-                .push_cache(*discovery_idle_timeout);
+                .push_idle_cache(*discovery_idle_timeout);
 
             // If there's no route, use the logical service directly; otherwise
             // use the per-route stack.

diff --git a/linkerd/app/outbound/src/ingress.rs b/linkerd/app/outbound/src/ingress.rs
@@ -151,7 +151,7 @@ impl Outbound<svc::ArcNewHttp<http::Endpoint>> {
                     )
                     // Caches the profile-based stack so that it can be reused across
                     // multiple requests to the same canonical destination.
-                    .push_cache(*discovery_idle_timeout)
+                    .push_idle_cache(*discovery_idle_timeout)
                     .push_on_service(
                         svc::layers()
                             .push(http::strip_header::request::layer(DST_OVERRIDE_HEADER))

diff --git a/linkerd/app/outbound/src/tcp/logical.rs b/linkerd/app/outbound/src/tcp/logical.rs
@@ -103,7 +103,7 @@ impl<C> Outbound<C> {
                 )
                 // TODO(ver) Can we replace this evicting cache? The detect
                 // stack would have to hold/reuse inner stacks.
-                .push_cache(*discovery_idle_timeout)
+                .push_idle_cache(*discovery_idle_timeout)
                 .check_new_service::<Logical, I>()
                 .instrument(|_: &Logical| debug_span!("tcp"))
                 .check_new_service::<Logical, I>()