linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy: Cleanup control::discovery (#797) 

`set_labels` was needlessly `Arc`ed.

`Metadata` does not need to be public.

No functional changes.
This commit is contained in:
Oliver Gould 2018-04-19 10:59:24 -07:00 committed by GitHub
parent 02258786b7
commit 53dd79afaa
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
proxy/src/control/discovery.rs
View File

@ -4,7 +4,6 @@ use std::fmt;
use std::iter::IntoIterator; use std::iter::IntoIterator;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::time::Duration; use std::time::Duration;
use std::sync::Arc;
use futures::{Async, Future, Poll, Stream}; use futures::{Async, Future, Poll, Stream};
use futures::sync::mpsc; use futures::sync::mpsc;
@ -61,7 +60,6 @@ pub struct Background {
/// A future returned from `Background::work()`, doing the work of talking to /// A future returned from `Background::work()`, doing the work of talking to
/// the controller destination API. /// the controller destination API.
// TODO: debug impl
pub struct DiscoveryWork<T: HttpService<ResponseBody = RecvBody>> { pub struct DiscoveryWork<T: HttpService<ResponseBody = RecvBody>> {
dns_resolver: dns::Resolver, dns_resolver: dns::Resolver,
default_destination_namespace: String, default_destination_namespace: String,
@ -77,7 +75,7 @@ pub struct DiscoveryWork<T: HttpService<ResponseBody = RecvBody>> {
/// Any additional metadata describing a discovered service. /// Any additional metadata describing a discovered service.
#[derive(Clone, Debug, Hash, Eq, PartialEq)] #[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct Metadata { struct Metadata {
/// A set of Prometheus metric labels describing the destination. /// A set of Prometheus metric labels describing the destination.
metric_labels: Option<DstLabels>, metric_labels: Option<DstLabels>,
} }
@ -194,11 +192,7 @@ impl Discovery {
// ==== impl Watch ===== // ==== impl Watch =====
impl<B> Watch<B> { impl<B> Watch<B> {
fn update_metadata(&mut self, fn update_metadata(&mut self, addr: SocketAddr, meta: Metadata) -> Result<(), ()> {
addr: SocketAddr,
meta: Metadata)
-> Result<(), ()>
{
if let Some(store) = self.metric_labels.get_mut(&addr) { if let Some(store) = self.metric_labels.get_mut(&addr) {
store.store(meta.metric_labels) store.store(meta.metric_labels)
.map_err(|e| { .map_err(|e| {
@ -516,11 +510,9 @@ impl<T> DestinationSet<T>
match rx.poll() { match rx.poll() {
Ok(Async::Ready(Some(update))) => match update.update { Ok(Async::Ready(Some(update))) => match update.update {
Some(PbUpdate2::Add(a_set)) => { Some(PbUpdate2::Add(a_set)) => {
let set_labels = Arc::new(a_set.metric_labels); let set_labels = a_set.metric_labels;
let addrs = a_set.addrs.into_iter() let addrs = a_set.addrs.into_iter()
.filter_map(|pb| .filter_map(|pb| pb_to_addr_meta(pb, &set_labels));
pb_to_addr_meta(pb, &set_labels)
);
self.add(auth, addrs) self.add(auth, addrs)
}, },
Some(PbUpdate2::Remove(r_set)) => { Some(PbUpdate2::Remove(r_set)) => {
@ -720,13 +712,10 @@ impl Metadata {
} }
/// Construct a new labeled `SocketAddr `from a protobuf `WeightedAddr`. /// Construct a new labeled `SocketAddr `from a protobuf `WeightedAddr`.
fn pb_to_addr_meta(pb: WeightedAddr, set_labels: &Arc<HashMap<String, String>>) fn pb_to_addr_meta(pb: WeightedAddr, set_labels: &HashMap<String, String>)
-> Option<(SocketAddr, Metadata)> { -> Option<(SocketAddr, Metadata)> {
let addr = pb.addr.and_then(pb_to_sock_addr)?; let addr = pb.addr.and_then(pb_to_sock_addr)?;
let label_iter = let label_iter = set_labels.iter().chain(pb.metric_labels.iter());
set_labels.as_ref()
.iter()
.chain(pb.metric_labels.iter());
let meta = Metadata { let meta = Metadata {
metric_labels: DstLabels::new(label_iter), metric_labels: DstLabels::new(label_iter),
}; };