Save size of completed export in the database (#42697)

This will be useful for measuring usage, and showing sizes on dashboard
and in future backup APIs.

GitOrigin-RevId: 6760da8464a43e3b518ac12389543f74eaeccdbb

Author: nipunn1313

crates/application/src/exports/worker.rs

@@ -322,6 +322,12 @@ impl<RT: Runtime> ExportWorker<RT> {
                 .0?
         };
 
+        let object_attributes = self
+            .exports_storage
+            .get_object_attributes(&object_key)
+            .await?
+            .context("error getting export object attributes from S3")?;
+
         // Export is done; mark it as such.
         tracing::info!("Export {id} completed");
         self.database
@@ -344,6 +350,7 @@ impl<RT: Runtime> ExportWorker<RT> {
                             snapshot_ts,
                             *tx.begin_timestamp(),
                             object_key,
+                            object_attributes.size,
                         )?;
                         SystemMetadataModel::new_global(tx)
                             .replace(id, completed_export.try_into()?)
@@ -356,12 +363,6 @@ impl<RT: Runtime> ExportWorker<RT> {
             )
             .await?;
 
-        let object_attributes = self
-            .exports_storage
-            .get_object_attributes(&object_key)
-            .await?
-            .context("error getting export object attributes from S3")?;
-
         let tag = requestor.usage_tag().to_string();
         let call_type = match requestor {
             ExportRequestor::SnapshotExport => CallType::Export,

crates/model/src/exports/mod.rs

@@ -359,9 +359,10 @@ mod tests {
         check_roundtrip(&in_progress_export);
 
         // Completed
-        let export = in_progress_export
-            .clone()
-            .completed(ts, ts, ObjectKey::try_from("asdf")?)?;
+        let export =
+            in_progress_export
+                .clone()
+                .completed(ts, ts, ObjectKey::try_from("asdf")?, 5)?;
         check_roundtrip(&export);
 
         // Failed
@@ -479,7 +480,7 @@ mod tests {
             ts_u64 + 1000,
         )
         .in_progress(ts)?
-        .completed(ts, ts, ObjectKey::try_from("asdf")?)?;
+        .completed(ts, ts, ObjectKey::try_from("asdf")?, 5)?;
         exports_model.insert_export(export).await?;
         let backups = exports_model.list_unexpired_cloud_backups().await?;
         assert!(backups.is_empty());
@@ -494,7 +495,7 @@ mod tests {
             ts_u64 - 1000,
         )
         .in_progress(ts)?
-        .completed(ts, ts, ObjectKey::try_from("asdf")?)?;
+        .completed(ts, ts, ObjectKey::try_from("asdf")?, 5)?;
         exports_model.insert_export(export).await?;
         let backups = exports_model.list_unexpired_cloud_backups().await?;
         assert!(backups.is_empty());
@@ -509,7 +510,7 @@ mod tests {
             ts_u64 + 1000,
         )
         .in_progress(ts)?
-        .completed(ts, ts, ObjectKey::try_from("asdf")?)?;
+        .completed(ts, ts, ObjectKey::try_from("asdf")?, 5)?;
         exports_model.insert_export(export).await?;
         let backups = exports_model.list_unexpired_cloud_backups().await?;
         assert_eq!(backups.len(), 1);
@@ -535,7 +536,7 @@ mod tests {
             ts_u64 + 1000,
         )
         .in_progress(ts)?
-        .completed(ts, ts, ObjectKey::try_from("asdf")?)?;
+        .completed(ts, ts, ObjectKey::try_from("asdf")?, 5)?;
         let id = exports_model.insert_export(export).await?;
 
         let new_expiration = ts_u64 + 2000;
@@ -572,7 +573,7 @@ mod tests {
             ts_u64,
         )
         .in_progress(ts)?
-        .completed(ts, ts, ObjectKey::try_from("asdf")?)?;
+        .completed(ts, ts, ObjectKey::try_from("asdf")?, 5)?;
         exports_model.insert_export(export).await?;
         assert_eq!(exports_model.list().await?.len(), 1);
         let toremove = exports_model
@@ -642,6 +643,7 @@ mod tests {
                 ts,
                 ts,
                 ObjectKey::try_from("asdf")?,
+                5,
             )?,
             initial_export.clone().in_progress(ts)?.failed(ts, ts)?,
             initial_export.clone().canceled(ts)?,

crates/model/src/exports/types.rs

@@ -66,6 +66,7 @@ pub enum Export {
         format: ExportFormat,
         component: ComponentId,
         requestor: ExportRequestor,
+        size: u64,
     },
     Failed {
         /// Timestamp for the failed (final) attempt at Export.
@@ -127,6 +128,8 @@ pub enum SerializedExport {
         format: SerializedExportFormat,
         component: Option<String>,
         requestor: String,
+        #[serde(default)] // 0-default for backward compatibility
+        size: i64,
     },
     Failed {
         start_ts: u64,
@@ -187,6 +190,7 @@ impl TryFrom<Export> for SerializedExport {
                 format,
                 component,
                 requestor,
+                size,
             } => SerializedExport::Completed {
                 start_ts: start_ts.into(),
                 complete_ts: complete_ts.into(),
@@ -195,6 +199,7 @@ impl TryFrom<Export> for SerializedExport {
                 format: format.into(),
                 component: component.serialize_to_string(),
                 requestor: requestor.to_string(),
+                size: size as i64,
             },
             Export::Failed {
                 start_ts,
@@ -267,6 +272,7 @@ impl TryFrom<SerializedExport> for Export {
                 format,
                 component,
                 requestor,
+                size,
             } => Export::Completed {
                 start_ts: start_ts.try_into()?,
                 complete_ts: complete_ts.try_into()?,
@@ -275,6 +281,7 @@ impl TryFrom<SerializedExport> for Export {
                 format: format.into(),
                 component: ComponentId::deserialize_from_string(component.as_deref())?,
                 requestor: requestor.parse()?,
+                size: size as u64,
             },
             SerializedExport::Failed {
                 start_ts,
@@ -474,6 +481,7 @@ impl Export {
         snapshot_ts: Timestamp,
         complete_ts: Timestamp,
         zip_object_key: ObjectKey,
+        size: u64,
     ) -> anyhow::Result<Export> {
         match self {
             Self::InProgress {
@@ -494,6 +502,7 @@ impl Export {
                     format,
                     component,
                     requestor,
+                    size,
                 })
             },
             Self::Requested {
@@ -510,6 +519,7 @@ impl Export {
                 format: _,
                 component: _,
                 requestor: _,
+                size: _,
             }
             | Self::Failed {
                 start_ts: _,
@@ -561,6 +571,7 @@ impl Export {
                 format: _,
                 component: _,
                 requestor: _,
+                size: _,
             }
             | Self::Failed {
                 start_ts: _,