Re: [PATCH proxmox-backup 1/5] notifications: move spool directory to /var/lib/proxmox-backup/notifications/queue

[Arthur Bied-Charreton <a.bied-charreton@proxmox.com>]

On Thu, Apr 09, 2026 at 03:27:17PM +0200, Lukas Wagner wrote:
> In anticipation of more notification-related data that might be stored
> soon (notification history, oauth tokens, etc.), we move the spool
> directory that is used to queue notifications that are sent by the proxy
> process to a separate subdirectory.
> 
> We still read from the old directory, for the rare cases that there
> might still be any unsent notifications before the package is upgraded.
> 
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
>  src/server/notifications/mod.rs | 30 ++++++++++++++++++++++++------
>  1 file changed, 24 insertions(+), 6 deletions(-)
> 
> diff --git a/src/server/notifications/mod.rs b/src/server/notifications/mod.rs
> index 95ff9ef18..15de5ccc5 100644
> --- a/src/server/notifications/mod.rs
> +++ b/src/server/notifications/mod.rs
> @@ -18,7 +18,11 @@ use pbs_api_types::{
>  use proxmox_notify::endpoints::sendmail::{SendmailConfig, SendmailEndpoint};
>  use proxmox_notify::{Endpoint, Notification, Severity};
>  
> -const SPOOL_DIR: &str = concatcp!(pbs_buildcfg::PROXMOX_BACKUP_STATE_DIR, "/notifications");
> +const SPOOL_DIR_OLD: &str = concatcp!(pbs_buildcfg::PROXMOX_BACKUP_STATE_DIR, "/notifications");
> +const SPOOL_DIR: &str = concatcp!(
> +    pbs_buildcfg::PROXMOX_BACKUP_STATE_DIR,
> +    "/notifications/queue"
> +);
>  
>  mod template_data;
>  
> @@ -43,14 +47,15 @@ pub fn create_spool_dir() -> Result<(), Error> {
>          .owner(backup_user.uid)
>          .group(backup_user.gid);
>  
> -    create_path(SPOOL_DIR, None, Some(opts))?;
> +    create_path(SPOOL_DIR, Some(opts), Some(opts))?;
>      Ok(())
>  }
>  
> -async fn send_queued_notifications() -> Result<(), Error> {
> -    let mut read_dir = tokio::fs::read_dir(SPOOL_DIR).await?;
> -
> -    let mut notifications = Vec::new();
> +async fn read_notifications_from_spool_dir(
> +    notifications: &mut Vec<Notification>,
> +    path: &str,
> +) -> Result<(), Error> {
> +    let mut read_dir = tokio::fs::read_dir(path).await?;
>  
>      while let Some(entry) = read_dir.next_entry().await? {
>          let path = entry.path();
> @@ -71,6 +76,19 @@ async fn send_queued_notifications() -> Result<(), Error> {
>          }
>      }
>  
> +    Ok(())
> +}
> +
> +async fn send_queued_notifications() -> Result<(), Error> {
> +    let mut notifications = Vec::new();
> +
> +    // Also read left-over notifications from the old directory -- we should be able to remove this
> +    // pretty soon.
> +    // FIXME: Remove this with the next minor update.
> +    read_notifications_from_spool_dir(&mut notifications, SPOOL_DIR_OLD).await?;
> +
> +    read_notifications_from_spool_dir(&mut notifications, SPOOL_DIR).await?;
> +
>      if notifications.is_empty() {
>          return Ok(());
>      }
> -- 
> 2.47.3
> 
> 
> 
> 
> 
Tested with both the old & the new proxmox-mail-forward binaries, lgtm

Tested-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
Reviewed-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>