[pve-devel] applied: [PATCH v5 container 0/4] lxc@ service: fix dependencies

Wolfgang Bumiller w.bumiller at proxmox.com
Fri Oct 13 13:21:34 CEST 2017


applied whole series

On Wed, Oct 11, 2017 at 02:13:09PM +0200, Fabian Gr├╝nbichler wrote:
> this series improves the systemd integration of LXC containers by:
> - ensuring PVE LXC container units don't have a (transitive) conflict with shutdown.target, thus preventing races between systemd- and pve-ha-lrm/pve-guest initiated stopping of containers
> - reworking the stop/reboot handling to reduce log spam of failed redundant lxc-stop calls, by only calling lxc-stop in our wrapper if the unit has not already successfully exited
> - installing snippets/unit to the correct location in /lib/systemd/system
> 
> changes since v4:
> - copy and rework lxc-pve-reboot-trigger as pve-container-stop-wrapper
> - use pve-container-stop-wrapper as ExecStop in pve-container@, instead of lxc-stop as ExecStop and lxc-pve-reboot-trigger as ExecStopPost
> 
> tested the following scenarios:
> - shutdown and reboot from within
> - shutdown via pct stop/API
> - shutdown and restart via systemctl stop/restart
> 
> Fabian Gr├╝nbichler (4):
>   install lxc@ snippets to correct location
>   add new pve-container units
>   switch to pve-container@ unit
>   build: mark lxc at .service.d for future removal
> 
>  src/Makefile                         | 15 +++++++++++----
>  src/PVE/API2/LXC/Status.pm           |  2 +-
>  src/PVE/VZDump/LXC.pm                |  2 +-
>  src/lxc-pve-poststop-hook            |  7 ++++---
>  src/pve-container-stop-wrapper       | 20 ++++++++++++++++++++
>  src/pve-container at .service           | 18 ++++++++++++++++++
>  "src/system-pve\\x2dcontainer.slice" |  9 +++++++++
>  7 files changed, 64 insertions(+), 9 deletions(-)
>  create mode 100755 src/pve-container-stop-wrapper
>  create mode 100644 src/pve-container at .service
>  create mode 100644 "src/system-pve\\x2dcontainer.slice"
> 
> -- 
> 2.14.1



More information about the pve-devel mailing list