fix incorrectly set edge weight upon new transport creation (#1946)

* fix incorrectly set link weight upon new transport creation

* prettier debug print for LinkEdgeWeight

Author: DenisBiryukov91

zenoh/src/net/protocol/linkstate.rs

@@ -11,7 +11,7 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <[email protected]>
 //
-use std::{collections::HashMap, num::NonZeroU16};
+use std::{collections::HashMap, fmt::Debug, num::NonZeroU16};
 
 use zenoh_config::TransportWeight;
 use zenoh_protocol::core::{Locator, WhatAmI, ZenohIdProto};
@@ -51,9 +51,18 @@ pub(crate) struct LinkState {
     pub(crate) link_weights: Option<Vec<u16>>,
 }
 
-#[derive(Default, Copy, Debug, Clone, PartialEq, Eq)]
+#[derive(Default, Copy, Clone, PartialEq, Eq)]
 pub(crate) struct LinkEdgeWeight(pub(crate) Option<NonZeroU16>);
 
+impl Debug for LinkEdgeWeight {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self.0 {
+            Some(w) => w.fmt(f),
+            None => self.0.fmt(f),
+        }
+    }
+}
+
 impl LinkEdgeWeight {
     const DEFAULT_LINK_WEIGHT: u16 = 100;
 

zenoh/src/net/protocol/network.rs

@@ -199,6 +199,12 @@ impl Network {
         }
 
         self.link_weights = link_weights;
+        tracing::info!(
+            "{} Update link weights to {:?}",
+            &self.name,
+            &self.link_weights
+        );
+
         if dests_to_update.is_empty()
             || !(self.full_linkstate || self.router_peers_failover_brokering)
         {
@@ -411,11 +417,8 @@ impl Network {
                 }))
     }
 
-    fn get_default_link_weight_to(&self, idx: NodeIndex) -> LinkEdgeWeight {
-        self.link_weights
-            .get(&self.graph[idx].zid)
-            .copied()
-            .unwrap_or_default()
+    fn get_default_link_weight_to(&self, zid: &ZenohIdProto) -> LinkEdgeWeight {
+        self.link_weights.get(zid).copied().unwrap_or_default()
     }
 
     fn update_edge(&mut self, idx1: NodeIndex, idx2: NodeIndex) {
@@ -837,17 +840,23 @@ impl Network {
                 }
             };
 
-            let link_weight = self.get_default_link_weight_to(idx);
+            let link_weight = self.get_default_link_weight_to(&zid);
+            self.graph[self.idx].links.insert(zid, link_weight);
+            self.graph[self.idx].sn += 1;
+
             if self.full_linkstate
                 && self.graph[idx]
                     .links
                     .contains_key(&self.graph[self.idx].zid)
             {
                 self.update_edge(self.idx, idx);
-                tracing::trace!("Update edge (link) {} {}", self.graph[self.idx].zid, zid);
+                tracing::trace!(
+                    "{} Update edge (link) {} {}",
+                    &self.name,
+                    self.graph[self.idx].zid,
+                    zid
+                );
             }
-            self.graph[self.idx].links.insert(zid, link_weight);
-            self.graph[self.idx].sn += 1;
 
             // Send updated self linkstate on all existing links except new one
             self.links