From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 2BFD61FF0C0 for ; Wed, 18 Nov 2026 10:52:32 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 63AD821E6B; Wed, 18 Nov 2026 10:45:14 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-mail-forward v2 62/63] add pve-notify-worker crate and package Date: Wed, 18 Nov 2026 10:43:46 +0100 Message-ID: <20261118094348.273646-63-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118094348.273646-1-l.wagner@proxmox.com> References: <20261118094348.273646-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794995042945 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.135 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: IMILHFAUD56GM7U37HDFKW63VTOUY6PR X-Message-ID-Hash: IMILHFAUD56GM7U37HDFKW63VTOUY6PR X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This new daemon hosts the notification worker task from proxmox-notify for Proxmox VE. It processes PVE's notification queue at /var/lib/pve-manager/notifications/queue, including mails submitted by the mail forwarder, and is meant to be pulled in as a service dependency by pve-manager. Signed-off-by: Lukas Wagner --- Cargo.toml | 6 +++ Makefile | 12 ++++-- debian/control | 7 ++++ debian/proxmox-mail-forward.install | 1 + debian/pve-notify-worker.install | 1 + debian/pve-notify-worker.service | 13 ++++++ debian/rules | 2 +- pve-notify-worker/Cargo.toml | 21 ++++++++++ pve-notify-worker/src/main.rs | 64 +++++++++++++++++++++++++++++ 9 files changed, 122 insertions(+), 5 deletions(-) create mode 100644 debian/proxmox-mail-forward.install create mode 100644 debian/pve-notify-worker.install create mode 100644 debian/pve-notify-worker.service create mode 100644 pve-notify-worker/Cargo.toml create mode 100644 pve-notify-worker/src/main.rs diff --git a/Cargo.toml b/Cargo.toml index 27e4d8e..59e94c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ members = [ "common", "proxmox-mail-forward", + "pve-notify-worker", ] resolver = "3" @@ -18,8 +19,13 @@ homepage = "https://www.proxmox.com" [workspace.dependencies] anyhow = "1.0" +futures = "0.3" nix = "0.29" +tokio = "1.6" +tracing = "0.1" +proxmox-async = "0.5" +proxmox-daemon = "1" proxmox-log = "1" proxmox-notify = "2" proxmox-sys = "1" diff --git a/Makefile b/Makefile index 0c7dc72..384037a 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,10 @@ BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION) DSC=rust-$(PACKAGE)_$(DEB_VERSION_UPSTREAM).dsc DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb +WORKER_DEB=pve-notify-worker_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb +WORKER_DBG_DEB=pve-notify-worker-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb -DEBS=$(DEB) $(DBG_DEB) +DEBS=$(DEB) $(DBG_DEB) $(WORKER_DEB) $(WORKER_DBG_DEB) ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release --target $(DEB_HOST_RUST_TYPE) @@ -22,7 +24,7 @@ CARGO ?= cargo $(BUILDDIR): rm -rf $@ $@.tmp && mkdir $@.tmp - cp -a debian Cargo.toml common proxmox-mail-forward Makefile .cargo $@.tmp + cp -a debian Cargo.toml common proxmox-mail-forward pve-notify-worker Makefile .cargo $@.tmp rm -f $@.tmp/Cargo.lock find $@.tmp/debian -name "*.hint" -delete mv $@.tmp $@ @@ -50,11 +52,13 @@ dinstall: $(DEBS) .PHONY: cargo-build cargo-build: $(CARGO) build $(CARGO_BUILD_ARGS) \ - --package proxmox-mail-forward + --package proxmox-mail-forward \ + --package pve-notify-worker install: cargo-build - install -d $(DESTDIR)/usr/libexec + install -d $(DESTDIR)/usr/libexec/proxmox install -m 0755 $(COMPILEDIR)/proxmox-mail-forward $(DESTDIR)/usr/libexec/ + install -m 0755 $(COMPILEDIR)/pve-notify-worker $(DESTDIR)/usr/libexec/proxmox/ .PHONY: upload upload: $(DEBS) diff --git a/debian/control b/debian/control index ebf96e1..3e574b7 100644 --- a/debian/control +++ b/debian/control @@ -30,3 +30,10 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Proxmox mail forward helper This package contains the Proxmox mail forward helper. It forwards mails to the address(es) of the root@pam user in Proxmox Backup Server and Proxmox VE. + +Package: pve-notify-worker +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, +Description: Proxmox VE notification worker + This package contains the worker that processes the notification queue of + Proxmox VE. diff --git a/debian/proxmox-mail-forward.install b/debian/proxmox-mail-forward.install new file mode 100644 index 0000000..1b08c0b --- /dev/null +++ b/debian/proxmox-mail-forward.install @@ -0,0 +1 @@ +usr/libexec/proxmox-mail-forward diff --git a/debian/pve-notify-worker.install b/debian/pve-notify-worker.install new file mode 100644 index 0000000..abdcdf7 --- /dev/null +++ b/debian/pve-notify-worker.install @@ -0,0 +1 @@ +usr/libexec/proxmox/pve-notify-worker diff --git a/debian/pve-notify-worker.service b/debian/pve-notify-worker.service new file mode 100644 index 0000000..dccbb61 --- /dev/null +++ b/debian/pve-notify-worker.service @@ -0,0 +1,13 @@ +[Unit] +Description=Proxmox VE notification worker +Wants=network-online.target +After=network-online.target + +[Service] +Type=exec +ExecStart=/usr/libexec/proxmox/pve-notify-worker +KillSignal=SIGINT +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules index ddde12f..2049ba3 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_configure: $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system dh_auto_configure -execute_after_dh_auto_install: +execute_after_dh_install: chmod u+s debian/proxmox-mail-forward/usr/libexec/proxmox-mail-forward override_dh_fixperms: diff --git a/pve-notify-worker/Cargo.toml b/pve-notify-worker/Cargo.toml new file mode 100644 index 0000000..61738e9 --- /dev/null +++ b/pve-notify-worker/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "pve-notify-worker" +description = "Proxmox VE notification worker" +version.workspace = true +authors.workspace = true +edition.workspace = true +license.workspace = true +homepage.workspace = true + +[dependencies] +anyhow.workspace = true +futures.workspace = true +tokio = { workspace = true, features = [ "full" ] } +tracing.workspace = true + +common.workspace = true + +proxmox-async.workspace = true +proxmox-daemon.workspace = true +proxmox-log.workspace = true +proxmox-notify = { workspace = true, features = [ "send-impl", "queue-worker", "pve-context", "legacy-matchers" ]} diff --git a/pve-notify-worker/src/main.rs b/pve-notify-worker/src/main.rs new file mode 100644 index 0000000..5f13b25 --- /dev/null +++ b/pve-notify-worker/src/main.rs @@ -0,0 +1,64 @@ +//! This binary hosts the notification worker for PVE. +//! +//! When sending a notification, it is written as a JSON file into the queue directory at +//! `/var/lib/pve-manager/notifications/queue`. +//! +//! The notification worker will periodically read the contents of the queue directory and process +//! any notification that was put there. +//! +//! The worker task was implemented in such a way that it tries to finish sending the currently +//! handled notification in case of a requested daemon shutdown. If there are multiple +//! notifications in the queue, they are handled one-by-one, giving ample opportunities for +//! a clean shutdown. + +#![deny(unsafe_code)] +#![deny(missing_docs)] + +use std::time::Duration; + +use anyhow::{Context, Error}; +use tracing::level_filters::LevelFilter; + +use proxmox_notify::context::pve::PVEContext; +use proxmox_notify::queue::{QueueConsumer, QueueWorker}; + +use common::Product; + +fn main() -> Result<(), Error> { + proxmox_log::Logger::from_env("PVE_LOG", LevelFilter::INFO) + .journald() + .init()?; + + proxmox_async::runtime::main(run()) +} + +async fn run() -> Result<(), Error> { + let signal_task = proxmox_daemon::shutdown_signal_task().context("unable to start daemon")?; + tokio::task::spawn(signal_task); + + tracing::info!("PVE notification worker starting up"); + + start_notification_worker().await?; + + tracing::info!("PVE notification worker shutting down"); + + Ok(()) +} + +/// Start the notification worker task +async fn start_notification_worker() -> Result<(), Error> { + let consumer = QueueConsumer::new(Product::Pve.queue_dir()); + + let notification_worker = std::pin::pin!( + QueueWorker::builder(proxmox_notify::Context::new(PVEContext), consumer) + .interval(Duration::from_secs(5)) + .retry_attempts(2) + .build() + .run() + ); + + let abort_future = std::pin::pin!(proxmox_daemon::shutdown_future()); + futures::future::select(notification_worker, abort_future).await; + + Ok(()) +} -- 2.47.3