Merge pull request #32489 from teskje/initialize-storage-workload-class

controller: initialize workload class for new storage clusters

Author: teskje

src/controller/src/clusters.rs

@@ -352,7 +352,8 @@ where
         id: ClusterId,
         config: ClusterConfig,
     ) -> Result<(), anyhow::Error> {
-        self.storage.create_instance(id);
+        self.storage
+            .create_instance(id, config.workload_class.clone());
         self.compute
             .create_instance(id, config.arranged_logs, config.workload_class)?;
         Ok(())

src/storage-client/src/controller.rs

@@ -373,7 +373,7 @@ pub trait StorageController: Debug {
     /// created with zero replicas.
     ///
     /// Panics if a storage instance with the given ID already exists.
-    fn create_instance(&mut self, id: StorageInstanceId);
+    fn create_instance(&mut self, id: StorageInstanceId, workload_class: Option<String>);
 
     /// Drops the storage instance with the given ID.
     ///

src/storage-controller/src/instance.rs

@@ -119,6 +119,7 @@ where
 {
     /// Creates a new [`Instance`].
     pub fn new(
+        workload_class: Option<String>,
         envd_epoch: NonZeroI64,
         metrics: InstanceMetrics,
         dyncfg: Arc<ConfigSet>,
@@ -130,7 +131,7 @@ where
         let epoch = ClusterStartupEpoch::new(envd_epoch, 0);
 
         let mut instance = Self {
-            workload_class: None,
+            workload_class,
             replicas: Default::default(),
             active_ingestions: Default::default(),
             ingestion_exports: Default::default(),

src/storage-controller/src/lib.rs

@@ -508,9 +508,10 @@ where
         self.storage_collections.check_exists(id)
     }
 
-    fn create_instance(&mut self, id: StorageInstanceId) {
+    fn create_instance(&mut self, id: StorageInstanceId, workload_class: Option<String>) {
         let metrics = self.metrics.for_instance(id);
         let mut instance = Instance::new(
+            workload_class,
             self.envd_epoch,
             metrics,
             Arc::clone(self.config().config_set()),