properly call .shutdown() in backup download handlers

Author: 0x7d8

application/src/server/backup/adapters/btrfs.rs

@@ -255,28 +255,32 @@ impl BackupExt for BtrfsBackup {
 
                 match archive_format {
                     StreamableArchiveFormat::Zip => {
-                        if let Err(err) =
-                            crate::server::filesystem::archive::create::create_zip_streaming(
-                                filesystem,
-                                writer,
-                                Path::new(""),
-                                names,
-                                None,
-                                ignore.into(),
-                                crate::server::filesystem::archive::create::CreateZipOptions {
-                                    compression_level: config.system.backups.compression_level,
-                                },
-                            )
-                            .await
+                        match crate::server::filesystem::archive::create::create_zip_streaming(
+                            filesystem,
+                            writer,
+                            Path::new(""),
+                            names,
+                            None,
+                            ignore.into(),
+                            crate::server::filesystem::archive::create::CreateZipOptions {
+                                compression_level: config.system.backups.compression_level,
+                            },
+                        )
+                        .await
                         {
-                            tracing::error!(
-                                "failed to create zip archive for btrfs backup: {}",
-                                err
-                            );
+                            Ok(inner) => {
+                                inner.into_inner().shutdown().await.ok();
+                            }
+                            Err(err) => {
+                                tracing::error!(
+                                    "failed to create zip archive for btrfs backup: {}",
+                                    err
+                                );
+                            }
                         }
                     }
                     _ => {
-                        if let Err(err) = crate::server::filesystem::archive::create::create_tar(
+                        match crate::server::filesystem::archive::create::create_tar(
                             filesystem,
                             writer,
                             Path::new(""),
@@ -291,10 +295,15 @@ impl BackupExt for BtrfsBackup {
                         )
                         .await
                         {
-                            tracing::error!(
-                                "failed to create tar archive for btrfs backup: {}",
-                                err
-                            );
+                            Ok(inner) => {
+                                inner.into_inner().shutdown().await.ok();
+                            }
+                            Err(err) => {
+                                tracing::error!(
+                                    "failed to create tar archive for btrfs backup: {}",
+                                    err
+                                );
+                            }
                         }
                     }
                 }

application/src/server/backup/adapters/ddup_bak.rs

@@ -419,7 +419,9 @@ impl BackupExt for DdupBakBackup {
                         )?;
                     }
 
-                    zip.finish()?;
+                    let mut inner = zip.finish()?.into_inner();
+                    inner.flush()?;
+                    inner.shutdown()?;
 
                     Ok(())
                 });
@@ -446,6 +448,9 @@ impl BackupExt for DdupBakBackup {
                     }
 
                     tar.finish()?;
+                    let mut inner = tar.into_inner()?.finish()?;
+                    inner.flush()?;
+                    inner.shutdown()?;
 
                     Ok(())
                 });

application/src/server/backup/adapters/restic.rs

@@ -662,6 +662,10 @@ impl BackupExt for ResticBackup {
                         }
                     }
 
+                    let mut inner = archive.finish()?.into_inner();
+                    inner.flush()?;
+                    inner.shutdown()?;
+
                     Ok(())
                 });
             }
@@ -698,7 +702,9 @@ impl BackupExt for ResticBackup {
                         );
                     }
 
-                    writer.finish()?;
+                    let mut inner = writer.finish()?;
+                    inner.flush()?;
+                    inner.shutdown()?;
 
                     Ok(())
                 });

application/src/server/backup/adapters/zfs.rs

@@ -242,28 +242,32 @@ impl BackupExt for ZfsBackup {
 
                 match archive_format {
                     StreamableArchiveFormat::Zip => {
-                        if let Err(err) =
-                            crate::server::filesystem::archive::create::create_zip_streaming(
-                                filesystem,
-                                writer,
-                                Path::new(""),
-                                names,
-                                None,
-                                ignore.into(),
-                                crate::server::filesystem::archive::create::CreateZipOptions {
-                                    compression_level: config.system.backups.compression_level,
-                                },
-                            )
-                            .await
+                        match crate::server::filesystem::archive::create::create_zip_streaming(
+                            filesystem,
+                            writer,
+                            Path::new(""),
+                            names,
+                            None,
+                            ignore.into(),
+                            crate::server::filesystem::archive::create::CreateZipOptions {
+                                compression_level: config.system.backups.compression_level,
+                            },
+                        )
+                        .await
                         {
-                            tracing::error!(
-                                "failed to create zip archive for btrfs backup: {}",
-                                err
-                            );
+                            Ok(inner) => {
+                                inner.into_inner().shutdown().await.ok();
+                            }
+                            Err(err) => {
+                                tracing::error!(
+                                    "failed to create zip archive for zfs backup: {}",
+                                    err
+                                );
+                            }
                         }
                     }
                     _ => {
-                        if let Err(err) = crate::server::filesystem::archive::create::create_tar(
+                        match crate::server::filesystem::archive::create::create_tar(
                             filesystem,
                             writer,
                             Path::new(""),
@@ -278,10 +282,15 @@ impl BackupExt for ZfsBackup {
                         )
                         .await
                         {
-                            tracing::error!(
-                                "failed to create tar archive for btrfs backup: {}",
-                                err
-                            );
+                            Ok(inner) => {
+                                inner.into_inner().shutdown().await.ok();
+                            }
+                            Err(err) => {
+                                tracing::error!(
+                                    "failed to create tar archive for zfs backup: {}",
+                                    err
+                                );
+                            }
                         }
                     }
                 }