Re: [pve-devel] [PATCH v2 guest-common 2/2] fix 3111: replicate guest on rollback if there are replication jobs for it

2021-08-12 Thread Fabian Ebner
I'll likely send the next version of the series today, but wanted to address some points from here first (so I don't have to quote everything there). Am 22.06.21 um 09:41 schrieb Fabian Grünbichler: On June 9, 2021 11:18 am, Fabian Ebner wrote: so that there will be a valid replication snapsh

Re: [pve-devel] [RFC/PATCH manager] ui: lxc options: disable features edit as non-root when container is privileged

2021-08-12 Thread Fabian Grünbichler
On August 6, 2021 10:59 am, Fabian Ebner wrote: > The backend won't allow any edits in this case, so better just disable > the edit button altogether. > > Signed-off-by: Fabian Ebner > --- > www/manager6/lxc/Options.js | 6 +- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git

[pve-devel] applied: [PATCH common] fix #2368: network: extend infiniband recognition in regex

2021-08-12 Thread Fabian Grünbichler
On August 6, 2021 1:07 pm, Lorenz Stechauner wrote: > Signed-off-by: Lorenz Stechauner > --- > src/PVE/Network.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm > index bb574e0..c6d3ee1 100644 > --- a/src/PVE/Network.pm > +++ b/sr

[pve-devel] applied: [PATCH storage] zfs: fix unmount request

2021-08-12 Thread Fabian Grünbichler
thanks! On August 5, 2021 10:33 am, Fabian Ebner wrote: > by not dying when the dataset is already unmounted. Can be triggered > for a container by doing two rollbacks in a row. > > Signed-off-by: Fabian Ebner > --- > PVE/Storage/ZFSPoolPlugin.pm | 5 - > 1 file changed, 4 insertions(+), 1

[pve-devel] [PATCH v3 storage 2/3] zfspool: add blockers parameter to volume_snapshot_is_possible

2021-08-12 Thread Fabian Ebner
useful for rollback, so that only the required replication snapshots can be removed, and it's possible to abort early without deleting any replication snapshots if there are other non-replication snasphots blocking rollback. Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 4 ++--

[pve-devel] [PATCH-SERIES v3] fix #3111: fix interaction of snapshot operations with replication

2021-08-12 Thread Fabian Ebner
For more context, see also: https://lists.proxmox.com/pipermail/pve-devel/2021-August/049694.html Changes from v2: * Many new patches, as the approach is different: For one, only replication snapshots that are blocking rollback are removed. Second, consider more snapshot candidates

[pve-devel] [PATCH v3 guest-common 4/7] replication: remove unused variable and style fixes

2021-08-12 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- src/PVE/Replication.pm | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 3da79be..83fc642 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -36,18 +36,25 @@

[pve-devel] [PATCH v3 qemu-server 1/1] config: rollback is possible: add blockers parameter

2021-08-12 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- PVE/QemuConfig.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index 7ee8876..b993378 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -430,14 +430,14 @@ sub __snapshot_rollback_hook { }

[pve-devel] [PATCH v3 guest-common 5/7] replication: pass guest config to find_common_replication_snapshot

2021-08-12 Thread Fabian Ebner
in preparation to iterate over all config snapshots when necessary. Signed-off-by: Fabian Ebner --- src/PVE/Replication.pm | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 83fc642..4056ea2 100644 --- a/src/PVE/Repli

[pve-devel] [PATCH v3 guest-common 1/7] partially fix #3111: snapshot rollback: improve removing replication snapshots

2021-08-12 Thread Fabian Ebner
Get the replicatable volumes from the snapshot config rather than the current config. And filter those volumes further to those that will actually be rolled back. Previously, a volume that only had replication snapshots (e.g. because it was added after the snapshot was taken, or the vmstate volume

[pve-devel] [PATCH v3 guest-common 3/7] partially fix #3111: further improve removing replication snapshots

2021-08-12 Thread Fabian Ebner
by using the new $blocker parameter. No longer remove all replication snapshots from affected volumes unconditionally, but check first if all blocking snapshots are replication snapshots. If they are, remove them and proceed with rollback. If they are not, die without removing any. For backwards c

[pve-devel] [RFC v3 guest-common 7/7] fix #3111: config: snapshot delete: check if replication still needs it

2021-08-12 Thread Fabian Ebner
and abort if it does and --force is not specified. After rollback, the rollback snapshot might still be needed as the base for incremental replication, because rollback removes (blocking) replication snapshots. It's not enough to limit the check to the most recent snapshot, because new snapshots

[pve-devel] [PATCH v3 storage 3/3] test: zfspool: extend some rollback is possible tests with new blockers parameter

2021-08-12 Thread Fabian Ebner
and fix a few typos. Signed-off-by: Fabian Ebner --- test/run_test_zfspoolplugin.pl | 65 +- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/test/run_test_zfspoolplugin.pl b/test/run_test_zfspoolplugin.pl index 2f63f1b..095ccb3 100755 --- a/test/ru

[pve-devel] [PATCH v3 storage 1/3] zfspool: add zfs_get_sorted_snapshot_list helper

2021-08-12 Thread Fabian Ebner
replacing the current zfs_get_latest_snapshot. For volume_snapshot_list, ignore errors as before. Signed-off-by: Fabian Ebner --- PVE/Storage/ZFSPoolPlugin.pm | 44 +++- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b

[pve-devel] [PATCH v3 container 1/1] config: rollback is possible: add blockers parameter

2021-08-12 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- src/PVE/LXC/Config.pm | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 8557e4c..814cbad 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -214,10 +214,15 @@ sub __snapsh

[pve-devel] [PATCH v3 guest-common 2/7] config: rollback: factor out helper for removing replication snapshots

2021-08-12 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- src/PVE/AbstractConfig.pm | 49 ++- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/PVE/AbstractConfig.pm b/src/PVE/AbstractConfig.pm index 493bf97..0d1c7ca 100644 --- a/src/PVE/AbstractConfig.pm +++ b/src/PVE

[pve-devel] [PATCH v3 guest-common 6/7] partially fix #3111: replication: be less picky when selecting incremental base

2021-08-12 Thread Fabian Ebner
After rollback, it might be necessary to start the replication from an earlier, possibly non-replication, snapshot, because the replication snapshot might have been removed from the source node. Previously, replication could only recover in case the current parent snapshot was already replicated.

[pve-devel] [PATCH kernel] fix #3552: cherry-pick PCI probe fixes

2021-08-12 Thread Fabian Grünbichler
breaking some NVME setups. these should be picked up by one of the next Ubuntu kernel releases, since both the breaking change and the fix are authored by Canonical devs. Signed-off-by: Fabian Grünbichler --- apply before pulling in next Ubuntu tag in case it is not contained ...sce-host-bridge

Re: [pve-devel] [PATCH v2 storage 1/9] storage: add new find_free_volname

2021-08-12 Thread Fabian Ebner
Am 06.08.21 um 15:46 schrieb Aaron Lauterer: This new method exposes the functionality to request a new, not yet used, volname for a storage. The default implementation will return the result from 'find_free_diskname' prefixed with "/" if $scfg->{path} exists. Otherwise it will only return the r

Re: [pve-devel] [PATCH storage 2/9] add disk rename feature

2021-08-12 Thread Fabian Ebner
Am 06.08.21 um 15:46 schrieb Aaron Lauterer: Functionality has been added for the following storage types: * directory ones, based on the default implementation: * directory * NFS * CIFS * gluster * ZFS * (thin) LVM * Ceph A new feature `rename` has been introduced to mark w

[pve-devel] [PATCH qemu-server] fix #3581: pass size via argument for memory-backend-ram qmp call

2021-08-12 Thread Constantin Herold
Signed-off-by: Constantin Herold --- PVE/QemuServer/Memory.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index f3e15f1..e34727f 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -155,7 +155,7 @@ sub

[pve-devel] [PATCH qemu-server] fix #2429: allow to specify cloud-init vendor snippet via cicustom

2021-08-12 Thread Constantin Herold
Signed-off-by: Constantin Herold --- PVE/QemuServer.pm | 8 PVE/QemuServer/Cloudinit.pm | 18 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index cc73af8..90a4496 100644 --- a/PVE/QemuServer.pm +++ b/PV

Re: [pve-devel] [PATCH v3 storage 2/3] zfspool: add blockers parameter to volume_snapshot_is_possible

2021-08-12 Thread Fabian Ebner
Am 12.08.21 um 13:01 schrieb Fabian Ebner: useful for rollback, so that only the required replication snapshots can be removed, and it's possible to abort early without deleting any replication snapshots if there are other non-replication snasphots blocking rollback. Signed-off-by: Fabian Ebner