[pve-devel] applied: Re: [PATCH v3 manager 08/13] Die if dumpdir and storage are both defined

2020-06-30 Thread Thomas Lamprecht
On 30.06.20 10:24, Fabian Ebner wrote: > dumpdir will be overwritten if a storage is specified > > Signed-off-by: Fabian Ebner > --- > PVE/VZDump.pm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > applied, thanks! ___ pve-devel

[pve-devel] applied: Re: [PATCH v3 manager 09/13] storage_info: avoid duplication

2020-06-30 Thread Thomas Lamprecht
On 30.06.20 10:24, Fabian Ebner wrote: > Signed-off-by: Fabian Ebner > --- > PVE/VZDump.pm | 19 +-- > 1 file changed, 9 insertions(+), 10 deletions(-) > > applied, thanks! ___ pve-devel mailing list pve-devel@pve.proxmox.com

[pve-devel] [PATCH v3 manager 08/13] Die if dumpdir and storage are both defined

2020-06-30 Thread Fabian Ebner
dumpdir will be overwritten if a storage is specified Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index dceeb9ca..ce8796d9 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -449,7 +449,9 @@

[pve-devel] [PATCH v3 storage 04/13] PBSPlugin: Add print_volid helper

2020-06-30 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- PVE/Storage/PBSPlugin.pm | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index fba4b2b..f029e55 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -88,6

[pve-devel] [PATCH v3 storage 01/13] Introduce prune-backups property for directory-based storages

2020-06-30 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- PVE/Storage/CIFSPlugin.pm | 1 + PVE/Storage/CephFSPlugin.pm| 1 + PVE/Storage/DirPlugin.pm | 5 ++-- PVE/Storage/GlusterfsPlugin.pm | 5 ++-- PVE/Storage/NFSPlugin.pm | 5 ++-- PVE/Storage/PBSPlugin.pm | 1 + PVE/Storage/Plugin.pm

[pve-devel] [PATCH v3 storage 02/13] Extend archive_info to include filename and logfilename

2020-06-30 Thread Fabian Ebner
Only expect the logfilename if the archive has a standard name. This also gives a mechanism to get an untainted filename. archive_info can take either a volume ID or a path as it's currently implemented. This is useful for vzdump when there is no storage (i.e. for 'vzdump --dumpdir'). Add a test

[pve-devel] [PATCH-SERIES v3] fix #2649: introduce prune-backups property for storages supporting backups

2020-06-30 Thread Fabian Ebner
Patch #12 is the 'real' change needed for the manager to get 'prune-backups' working. Patch #13 gets rid of 'maxfiles' internally, re-using 'prune-backups' instead. Most other new patches/changes are in preparation for those two, to make it possible to translate maxfiles to keep-last and not have

[pve-devel] [PATCH v3 storage 03/13] Add archive_remove

2020-06-30 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- Changes in v3: * die if unlink of archive fails * check whether log file exists before trying to unlink it * warn if unlink of log file fails PVE/Storage.pm | 17 + 1 file changed, 17 insertions(+) diff --git a/PVE/Storage.pm

[pve-devel] applied: Re: [PATCH v3 manager 10/13] Simplify how maxfiles is determined

2020-06-30 Thread Thomas Lamprecht
On 30.06.20 10:24, Fabian Ebner wrote: > No functional change is intended. > The preference order is: option, then storage config, then vzdump defaults. > > Signed-off-by: Fabian Ebner > --- > > IMHO the old method was very confusing. > > PVE/VZDump.pm | 11 --- > 1 file changed, 4

[pve-devel] applied: Re: [PATCH v3 storage 06/13] Whitespace cleanup

2020-06-30 Thread Thomas Lamprecht
On 30.06.20 10:24, Fabian Ebner wrote: > Signed-off-by: Fabian Ebner > --- > PVE/API2/Storage/Status.pm | 65 +++--- > 1 file changed, 32 insertions(+), 33 deletions(-) > > applied, thanks! ___ pve-devel mailing list

[pve-devel] [PATCH v3 manager 13/13] Always use prune-backups instead of maxfiles internally

2020-06-30 Thread Fabian Ebner
For the use case with '--dumpdir', it's not possible to call prune_backups directly, so a little bit of special handling is required there. Signed-off-by: Fabian Ebner --- Note that $opts->{'prune-backups'} is always defined after new(). PVE/VZDump.pm | 39

[pve-devel] [PATCH v3 storage 07/13] Add API and pvesm calls for prune_backups

2020-06-30 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- PVE/API2/Storage/Makefile| 2 +- PVE/API2/Storage/PruneBackups.pm | 153 +++ PVE/API2/Storage/Status.pm | 7 ++ PVE/CLI/pvesm.pm | 27 ++ 4 files changed, 188 insertions(+), 1 deletion(-) create

[pve-devel] [PATCH v3 manager 09/13] storage_info: avoid duplication

2020-06-30 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index ce8796d9..9bdb5ab0 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -84,19 +84,18 @@ sub storage_info {

[pve-devel] [PATCH v3 storage 06/13] Whitespace cleanup

2020-06-30 Thread Fabian Ebner
Signed-off-by: Fabian Ebner --- PVE/API2/Storage/Status.pm | 65 +++--- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index 14f5930..d9d9b36 100644 --- a/PVE/API2/Storage/Status.pm +++

[pve-devel] [PATCH v3 manager 12/13] Use prune-backups instead of maxfiles when configured

2020-06-30 Thread Fabian Ebner
and make the two options mutally exclusive. Defines the backup limit for prune-backups as the sum of all keep-values. There is no perfect way to determine whether a new backup would trigger a removal with prune later: 1. we would need a way to include the not yet existing backup in a 'prune

[pve-devel] [PATCH v3 manager 10/13] Simplify how maxfiles is determined

2020-06-30 Thread Fabian Ebner
No functional change is intended. The preference order is: option, then storage config, then vzdump defaults. Signed-off-by: Fabian Ebner --- IMHO the old method was very confusing. PVE/VZDump.pm | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/PVE/VZDump.pm

[pve-devel] [PATCH v3 storage 05/13] Add prune_backups to storage API

2020-06-30 Thread Fabian Ebner
Implement it for generic storages supporting backups (i.e. directory-based storages) and add a wrapper for PBS. Signed-off-by: Fabian Ebner --- Changes in v3: * When checking if all keep-options are 0, improve readability by using hash values directly * For creation times in

[pve-devel] [PATCH v3 manager 11/13] make use of archive_info and archive_remove

2020-06-30 Thread Fabian Ebner
to avoid some code duplication. Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index b1107eac..e8669665 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -631,10 +631,15 @@

[pve-devel] applied: Re: [PATCH v2 widget-toolkit] adapt auth utils for proxmox token authentication

2020-06-30 Thread Thomas Lamprecht
On 07.05.20 14:28, Tim Marx wrote: > Signed-off-by: Tim Marx > --- > > Notes: > changed since v1: > * store user info as product independent object > > Utils.js | 23 --- > 1 file changed, 20 insertions(+), 3 deletions(-) > > Had to resolve the merge conflict due

[pve-devel] [RFC pve-qemu] Add systemd journal logging patch

2020-06-30 Thread Stefan Reiter
Prints QEMU errors that occur *after* the "-daemonize" fork to the systemd journal, instead of pushing them into /dev/null like before. Signed-off-by: Stefan Reiter --- Useful for debugging rust panics for example. I'm sure there's other ways to go about this (log files? pass the journal fd

[pve-devel] applied: Re: [PATCH v2 common 1/5] jsonschema: register 'timezone' format and add verification method

2020-06-30 Thread Thomas Lamprecht
On 17.06.20 15:32, Oguz Bektas wrote: > /usr/share/zoneinfo/zone.tab has the valid list of time zones. > > Signed-off-by: Oguz Bektas > --- > > v1->v2: > * don't use array for verifying format > > src/PVE/JSONSchema.pm | 19 +++ > 1 file changed, 19 insertions(+) > > diff

[pve-devel] [PATCH pve-network] use PVE::Tools::split_list for ip lists

2020-06-30 Thread Alexandre Derumier
Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/EvpnPlugin.pm | 4 ++-- PVE/Network/SDN/Zones/EvpnPlugin.pm | 2 +- PVE/Network/SDN/Zones/VxlanPlugin.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm

[pve-devel] [PATCH container] fix #2820: block adding new volume with same id if it's pending delete

2020-06-30 Thread Oguz Bektas
do a simple check to see if our $opt is already in the delete section. Signed-off-by: Oguz Bektas --- src/PVE/LXC/Config.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 0a28380..237e2e5 100644 --- a/src/PVE/LXC/Config.pm +++

Re: [pve-devel] [PATCH v2 0/5] timezones for containers

2020-06-30 Thread Oguz Bektas
hi, is anyone reviewing this patch? On Wed, Jun 17, 2020 at 03:32:28PM +0200, Oguz Bektas wrote: > this patch series implements the 'timezone' option for containers. > > more detailed info is in the commit messages. > > v1->v2: > > * don't use an array of valid timezones in format

Re: [pve-devel] [PATCH v2 manager] ui: auth: add api token authentication to login window

2020-06-30 Thread Thomas Lamprecht
On 07.05.20 14:28, Tim Marx wrote: > Signed-off-by: Tim Marx > --- > > Notes: > changed since v1: > * store token including the product prefix > * add token id to username to make it more obvious that it's note the > actual user > > www/manager6/Workspace.js | 5 ++ >

Re: [pve-devel] [RFC pve-qemu] Add systemd journal logging patch

2020-06-30 Thread Dietmar Maurer
comments inline > On 06/30/2020 2:06 PM Stefan Reiter wrote: > > > Prints QEMU errors that occur *after* the "-daemonize" fork to the > systemd journal, instead of pushing them into /dev/null like before. > > Signed-off-by: Stefan Reiter > --- > > Useful for debugging rust panics for