chore: allow passing flag to disable check

Signed-off-by: Abhinandan Purkait <[email protected]>

Author: Abhinandan-Purkait

control-plane/agents/src/bin/core/tests/pool/mod.rs

@@ -1059,6 +1059,7 @@ async fn slow_create() {
     {
         let cluster = ClusterBuilder::builder()
             .with_io_engines(1)
+            .with_allow_non_persistent_devlink(true)
             .with_reconcile_period(Duration::from_millis(250), Duration::from_millis(250))
             .with_cache_period("200ms")
             .with_options(|o| o.with_io_engine_devices(vec![lvol.path()]))
@@ -1176,6 +1177,7 @@ async fn reject_devlink_reuse() {
             .await
             .expect("Failed to build cluster");
 
+        let dev_path = lvol.path();
         let client = cluster.grpc_client();
 
         let bds = client
@@ -1191,17 +1193,29 @@ async fn reject_devlink_reuse() {
             .expect("Failed to get block devices")
             .into_inner();
 
-        let dev_path = lvol.path();
         let matched_device = bds
             .iter()
             .find(|bd| {
-                bd.devlinks.iter().any(|link| link == &dev_path.to_string())
-                    || bd.devname == dev_path
-                    || bd.devpath == dev_path
+                let dev_path_str = dev_path.to_string();
+                bd.devname == dev_path_str
+                    || bd.devpath == dev_path_str
+                    || bd.devlinks.iter().any(|link| link == &dev_path_str)
             })
             .expect("Block device should exist");
 
-        let device_devlinks = &matched_device.devlinks;
+        let device_devlinks: Vec<&str> = matched_device
+            .devlinks
+            .iter()
+            .filter_map(|link| link.strip_prefix("/dev/disk/by-"))
+            .map(|s| {
+                &matched_device
+                    .devlinks
+                    .iter()
+                    .find(|l| l.ends_with(s))
+                    .unwrap()[..]
+            })
+            .collect();
+
         assert!(
             device_devlinks.len() >= 2,
             "Expected at least 2 devlinks, found {}",
@@ -1214,6 +1228,7 @@ async fn reject_devlink_reuse() {
             disks: vec![device_devlinks
                 .first()
                 .expect("At least one devlink should be present")
+                .to_string()
                 .into()],
             labels: None,
             encryption: Some(Encryption::Secret(EncryptionSecret {
@@ -1233,6 +1248,7 @@ async fn reject_devlink_reuse() {
             disks: vec![device_devlinks
                 .get(1)
                 .expect("Another devlink should be present")
+                .to_string()
                 .into()],
             labels: None,
             encryption: Some(Encryption::Secret(EncryptionSecret {

deployer/src/infra/agents/core.rs

@@ -71,6 +71,9 @@ impl ComponentAction for CoreAgent {
         if let Some(max_rebuilds) = &options.max_rebuilds {
             binary = binary.with_args(vec!["--max-rebuilds", &max_rebuilds.to_string()]);
         }
+        if options.allow_non_persistent_devlink {
+            binary = binary.with_args(vec!["--allow-non-persistent-devlink"]);
+        }
         Ok(cfg.add_container_spec(
             ContainerSpec::from_binary(name, binary).with_portmap("50051", "50051"),
         ))

deployer/src/lib.rs

@@ -354,6 +354,9 @@ pub struct StartOptions {
     /// Mount host dev and udev.
     #[clap(long)]
     mount_host_dev_udev: bool,
+    /// Allow non persistent devlink for pool creation.
+    #[clap(long)]
+    allow_non_persistent_devlink: bool,
 }
 
 /// List of KeyValues
@@ -607,6 +610,12 @@ impl StartOptions {
         self
     }
 
+    /// Specify whether allow non peristent devlink is needed or not.
+    pub fn with_allow_non_persistent_devlink(mut self, enabled: bool) -> Self {
+        self.allow_non_persistent_devlink = enabled;
+        self
+    }
+
     pub(crate) fn app_nodes(&self) -> u32 {
         if self.csi_node {
             self.app_nodes.unwrap_or(1)

utils/deployer-cluster/src/lib.rs

@@ -993,6 +993,11 @@ impl ClusterBuilder {
         self.opts = self.opts.with_mount_host_dev_udev(enabled);
         self
     }
+    /// Specify whether allow non peristent devlink is needed or not.
+    pub fn with_allow_non_persistent_devlink(mut self, enabled: bool) -> Self {
+        self.opts = self.opts.with_allow_non_persistent_devlink(enabled);
+        self
+    }
     /// Build into the resulting Cluster using a composer closure, eg:
     /// .compose_build(|c| c.with_logs(false)).
     pub async fn compose_build<F>(mut self, set: F) -> Result<Cluster, Error>