[scheduler] Add hardware tags to rust scheduler (#2155)

A new tag type was added by
#2125 and needs
to be handled by the Scheduler module to account for the new type

Author: DiegoTavares

rust/crates/scheduler/src/cluster.rs

@@ -106,6 +106,7 @@ impl ClusterFeed {
             .chain(cluster_dao.fetch_non_alloc_clusters());
         let mut clusters = Vec::new();
         let mut manual_tags: HashMap<Uuid, Vec<String>> = HashMap::new();
+        let mut hardware_tags: HashMap<Uuid, Vec<String>> = HashMap::new();
         let mut hostname_tags: HashMap<Uuid, Vec<String>> = HashMap::new();
 
         // Collect all tags
@@ -149,6 +150,12 @@ impl ClusterFeed {
                                 .or_default()
                                 .push(cluster.tag);
                         }
+                        "HARDWARE" => {
+                            hardware_tags
+                                .entry(parse_uuid(&cluster.facility_id))
+                                .or_default()
+                                .push(cluster.tag);
+                        }
                         _ => (),
                     };
                 }
@@ -189,6 +196,25 @@ impl ClusterFeed {
             }
         }
 
+        // Chunk Hardware tags
+        for (facility_id, tags) in hardware_tags.into_iter() {
+            for chunk in &tags
+                .into_iter()
+                // Hardware share the same size as manual to simplify configuration
+                .chunks(CONFIG.queue.manual_tags_chunk_size)
+            {
+                clusters.push(Cluster::TagsKey(
+                    facility_id,
+                    chunk
+                        .map(|name| Tag {
+                            name,
+                            ttype: TagType::Hardware,
+                        })
+                        .collect(),
+                ))
+            }
+        }
+
         Ok(ClusterFeed {
             clusters: Arc::new(RwLock::new(clusters)),
             current_index: Arc::new(AtomicUsize::new(0)),

rust/crates/scheduler/src/cluster_key.rs

@@ -18,6 +18,7 @@ pub enum TagType {
     Alloc,
     HostName,
     Manual,
+    Hardware,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Hash, PartialEq, Eq)]

rust/crates/scheduler/src/host_cache/actor.rs

@@ -376,13 +376,16 @@ impl HostCacheService {
                 show_id,
                 tag,
             })
-            // Make sure tags are evaluated in this order: MANUAL -> HOSTNAME -> ALLOC
+            // Make sure tags are evaluated in this order:
+            // MANUAL -> HOSTNAME -> HARDWARE -> ALLOC
             .sorted_by(|l, r| match (&l.tag.ttype, &r.tag.ttype) {
                 (TagType::Alloc, TagType::Alloc)
                 | (TagType::HostName, TagType::HostName)
+                | (TagType::Hardware, TagType::Hardware)
                 | (TagType::Manual, TagType::Manual) => Ordering::Equal,
                 (TagType::Manual, _) => Ordering::Less,
                 (TagType::HostName, _) => Ordering::Less,
+                (TagType::Hardware, _) => Ordering::Less,
                 (TagType::Alloc, _) => Ordering::Greater,
             })
     }