chore(routing,config): tidy up code and logs

Polish logs, remove duped methods.

Signed-off-by: Fredi Raspall <fredi@githedgehog.com>

Author: Fredi-raspall

mgmt/src/processor/gwconfigdb.rs

@@ -48,18 +48,13 @@ impl GwConfigDatabase {
         self.applied = config;
     }
 
-    /// Get a refcounted reference to the applied `GwConfig`
-    pub fn get_applied(&self) -> Arc<ValidatedGwConfig> {
-        self.applied.clone()
-    }
-
     /// Get the generation Id of the currently applied config, if any.
     #[must_use]
     pub fn get_current_gen(&self) -> GenId {
         self.applied.genid()
     }
 
-    /// Get a reference to the config currently applied, if any.
+    /// Get a refcounted reference to the applied `GwConfig`
     #[must_use]
     pub fn get_current_config(&self) -> Arc<ValidatedGwConfig> {
         self.applied.clone()

mgmt/src/processor/proc.rs

@@ -188,7 +188,7 @@ impl ConfigProcessor {
 
     /// Attempt to apply the previously applied config.
     async fn rollback(&mut self) {
-        let active = self.config_db.get_applied();
+        let active = self.config_db.get_current_config();
         let active_genid = active.genid();
         info!("Rolling back to config with genid {}...", active.genid());
         let result = self.apply_gw_config(active.clone()).await.map(drop);

routing/src/frr/frrmi.rs

@@ -15,7 +15,7 @@ use crate::router::revent::{ROUTER_EVENTS, RouterEvent, revent};
 use config::GenId;
 
 #[allow(unused)]
-use tracing::{debug, error, info, trace, warn};
+use tracing::{debug, error, info, warn};
 
 use tracectl::trace_target;
 trace_target!("frrmi", LevelFilter::DEBUG, &["routing-full"]);
@@ -240,7 +240,7 @@ impl Frrmi {
 
         // Attempt to clean-up the config before re-applying the actual config.
         // This is disabled as the blank config is unsuitable for us and providing a suitable
-        //  one requires the ability to build frr configs, which we don't have here.
+        // one requires the ability to build frr configs, which we don't have here.
         if false {
             self.requests.push_front(FrrmiRequest::blank());
         }
@@ -328,22 +328,22 @@ impl Frrmi {
         };
         loop {
             let pending = self.readb.next_read_len();
-            trace!("Recv data (read:{} pending:{pending})", self.readb.used);
+            debug!("Recv data (read:{} pending:{pending})", self.readb.used);
             match Self::recv(sock, &mut self.readb, pending) {
                 Ok(0) => {
                     revent!(RouterEvent::FrrmiPeerLeft);
                     return Err(FrrErr::PeerLeft);
                 }
                 Ok(_) => {
-                    if self.readb.next_read_len() == 0 {
-                        {
-                            let response = self.readb.deserialize()?;
-                            return Ok(Some(response));
-                        }
+                    let pending = self.readb.next_read_len();
+                    if pending == 0 {
+                        let response = self.readb.deserialize()?;
+                        return Ok(Some(response));
                     }
                     // did not receive the complete message and need to read more
+                    debug!("Expecting {pending} octets of data from frr agent");
                 }
-                // we must wait. Can't provide a message yet
+                // we must wait and cannot provide a message yet
                 Err(ref e) if e.kind() == ErrorKind::WouldBlock => return Ok(None),
                 // recv failed due to unrecoverable reason. Will restart
                 Err(e) => return Err(FrrErr::IOFailure(e.to_string())),

routing/src/router/ctl.rs

@@ -215,16 +215,13 @@ fn handle_configure(
         return;
     }
 
-    /* request application of frr config */
+    /* request application of frr config. This is infallible */
     if let Some(frr_config) = config.get_frr_config() {
         rio.request_frr_config(config.genid(), frr_config.clone());
     }
 
-    /* generate event depending on result */
-    match result {
-        Ok(()) => revent!(RouterEvent::ConfigSuceeded(config.genid())),
-        Err(_) => revent!(RouterEvent::ConfigFailed(config.genid())),
-    }
+    /* generate event: we successfully applied the router config and FRR's is on its way  */
+    revent!(RouterEvent::ConfigSuceeded(config.genid()));
 
     /* reply */
     let _ = reply_to.send(RouterCtlReply::Result(result)).map_err(|e| {