Re: [pve-devel] [RFC ha-manager] fix 'change_service_location' misuse and recovery from fencing

2016-02-12 Thread Dietmar Maurer
that looks great, thanks! ___ pve-devel mailing list pve-devel@pve.proxmox.com http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Wolfgang Bumiller
> On February 12, 2016 at 5:16 PM Dietmar Maurer wrote: > > > > > > On February 12, 2016 at 5:01 PM Wolfgang Bumiller > > wrote: > > > > > > > > > On February 12, 2016 at 4:51 PM Dietmar Maurer > > > wrote: > > > > > > > > > > > > Since mountpoints can be inherited and modified (and s

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Dietmar Maurer
> On February 12, 2016 at 5:01 PM Wolfgang Bumiller > wrote: > > > > > On February 12, 2016 at 4:51 PM Dietmar Maurer wrote: > > > > > > > > > Since mountpoints can be inherited and modified (and set to 'legacy' > > > > > and 'none') we need to deal with this. The current method of assumin

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Wolfgang Bumiller
> On February 12, 2016 at 4:51 PM Dietmar Maurer wrote: > > > > > > Since mountpoints can be inherited and modified (and set to 'legacy' > > > > and 'none') we need to deal with this. The current method of assuming > > > > default paths doesn't always work. > > > > > > Can't we make this a req

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Wolfgang Bumiller
> On February 12, 2016 at 4:39 PM Dietmar Maurer wrote: > > > > > Since mountpoints can be inherited and modified (and set to 'legacy' > > > and 'none') we need to deal with this. The current method of assuming > > > default paths doesn't always work. > > > > Can't we make this a requirement i

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Dietmar Maurer
> > > Since mountpoints can be inherited and modified (and set to 'legacy' > > > and 'none') we need to deal with this. The current method of assuming > > > default paths doesn't always work. > > > > Can't we make this a requirement instead (document and verify somehow)? > > For example, we could

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Dietmar Maurer
> > Since mountpoints can be inherited and modified (and set to 'legacy' > > and 'none') we need to deal with this. The current method of assuming > > default paths doesn't always work. > > Can't we make this a requirement instead (document and verify somehow)? For example, we could verify that i

Re: [pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Dietmar Maurer
> Since mountpoints can be inherited and modified (and set to 'legacy' > and 'none') we need to deal with this. The current method of assuming > default paths doesn't always work. Can't we make this a requirement instead (document and verify somehow)? _

[pve-devel] [RFC ha-manager] fix 'change_service_location' misuse and recovery from fencing

2016-02-12 Thread Thomas Lamprecht
First rename the change_service_location method from the environment to an more fitting name, 'steal_service'. The 'change_service_location' from the virtual hardware class stays at it is, because there the name fits (those function have not the same meaning, so it's good that they named different

[pve-devel] [PATCH container] zfs: deal with legacy mountpoints

2016-02-12 Thread Wolfgang Bumiller
--- This needs the pve-storage zfs patch. src/PVE/LXC.pm | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index a737fc0..6010bb4 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -2309,7 +2309,7 @@ sub mountpoint_mount { my $

[pve-devel] [PATCH storage] zfs: get the real mountpoint in path()

2016-02-12 Thread Wolfgang Bumiller
--- Since mountpoints can be inherited and modified (and set to 'legacy' and 'none') we need to deal with this. The current method of assuming default paths doesn't always work. 'legacy' mounts don't have an actual path, so they need to be mounted via `mount -t zfs` while mountpoints with paths *s

Re: [pve-devel] [PATCH v2 qemu-server 0/2] write_config harmonization

2016-02-12 Thread Dietmar Maurer
applied ___ pve-devel mailing list pve-devel@pve.proxmox.com http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH container] lxc: read-only bind mounts

2016-02-12 Thread Dietmar Maurer
applied, but I do a 'die' inside bindmount (instead of only warn) ___ pve-devel mailing list pve-devel@pve.proxmox.com http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH common] limit vmid with JSON format

2016-02-12 Thread Dominik Csapak
if we do not do this, vmids < 100 (not really bad) and vmids > 9 are possible, which can lead to vms which you can only get rid of, if you delete the config files manually also this makes the api consistent with the webgui for vmids Signed-off-by: Dominik Csapak --- src/PVE/JSONSchema.p

[pve-devel] [PATCH container] lxc: read-only bind mounts

2016-02-12 Thread Wolfgang Bumiller
Factored the bind-mounting into a bindmount() function since we don't want to leave a writable bind-mount behind if the read-only remount fails. The read-only flag is now also removed from the initial mount flags and is added only for the remount command and is added separately the non-bind mounts

Re: [pve-devel] [PATCH common] network: get rid of ioctl.ph

2016-02-12 Thread Dietmar Maurer
applied ___ pve-devel mailing list pve-devel@pve.proxmox.com http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH v2 qemu-server 1/2] Refactor update_config_nolock -> write_config

2016-02-12 Thread Fabian Grünbichler
The method update_config wrapped update_config_nolock using lock_config, but to prevent update races the whole "read config", "do something", "write config" flow was always protected by lock_config anyway, and update_config was never called. Thus, we can safely drop update_config and rename update

[pve-devel] [PATCH v2 qemu-server 2/2] Drop skiplock from write_config

2016-02-12 Thread Fabian Grünbichler
Since write_config was always called with skiplock=1 except once, it makes sense to drop this parameter like in PVE::LXC::write_config . If needed in the future, the caller can use check_lock before write_config anyway. --- PVE/API2/Qemu.pm | 24 PVE/CLI/qm.pm | 2

[pve-devel] [PATCH v2 qemu-server 0/2] write_config harmonization

2016-02-12 Thread Fabian Grünbichler
Two patches that prepare for common config write code paths. The implementation of write_config for Qemu is now identical to that in LXC. Fabian Grünbichler (2): Refactor update_config_nolock -> write_config Drop skiplock from write_config PVE/API2/Qemu.pm | 26 +-

Re: [pve-devel] [RFC manager v3] ext6/triton: add some visual changes and fixes

2016-02-12 Thread Dietmar Maurer
applied ___ pve-devel mailing list pve-devel@pve.proxmox.com http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH qemu-server] Refactor update_config_nolock -> write_config

2016-02-12 Thread Fabian Grünbichler
The method update_config wrapped update_config_nolock using lock_config, but to prevent update races the whole "read config", "do something", "write config" flow was always protected by lock_config anyway, and update_config was never called. Thus, we can safely drop update_config and rename update

[pve-devel] [PATCH common] network: get rid of ioctl.ph

2016-02-12 Thread Wolfgang Bumiller
--- src/PVE/Network.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index dd36505..0f92e30 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -11,11 +11,11 @@ use POSIX qw(ECONNREFUSED); use Net::IP; -require "sys/ioc

[pve-devel] [PULL container 5/5] alpine: read /etc/alpine-release

2016-02-12 Thread Wolfgang Bumiller
--- src/PVE/LXC/Setup/Alpine.pm | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PVE/LXC/Setup/Alpine.pm b/src/PVE/LXC/Setup/Alpine.pm index 7f7da3a..e35ea5a 100644 --- a/src/PVE/LXC/Setup/Alpine.pm +++ b/src/PVE/LXC/Setup/Alpine.pm @@ -14,7 +14,10 @@ use base qw(PVE::LX

[pve-devel] [PULL container 2/5] alpine: cleanup

2016-02-12 Thread Wolfgang Bumiller
--- src/PVE/LXC/Setup/Alpine.pm | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PVE/LXC/Setup/Alpine.pm b/src/PVE/LXC/Setup/Alpine.pm index b32c798..f294961 100644 --- a/src/PVE/LXC/Setup/Alpine.pm +++ b/src/PVE/LXC/Setup/Alpine.pm @@ -3,7 +3,6 @@ package PVE::LXC:

[pve-devel] [PULL container 3/5] install Alpine.pm and configure its network

2016-02-12 Thread Wolfgang Bumiller
Since busybox' current default DHCPv6 client is unfinished and alpine currently doesn't handle a 'dhcp' interface type in its /etc/network/interfaces and bails out when configuring the network with a broken config we have to make sure we don't pass this on to debian's setup_network. Unfortunately

[pve-devel] [PULL container 4/5] use common/userns.conf if no ostype-speicifc one exists

2016-02-12 Thread Wolfgang Bumiller
(LXC doesn't ship an alpine.conf) --- src/PVE/LXC.pm | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index bdda866..80d4016 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1083,9 +1083,13 @@ sub update_lxc_config { my $ostype

[pve-devel] [PULL container 0/5] alpine support

2016-02-12 Thread Wolfgang Bumiller
The following changes since commit 3cc56749060f98098690c5203b00dd21e553c66c: Refactor lock_container into lock_config_[xx] (2016-02-12 08:18:04 +0100) are available in the git repository at: git://github.com/Blub/pve-container.git alpine for you to fetch changes up to 51a74a2c75d771cf9c294a

[pve-devel] [PULL container 1/5] add Alpine Linux distribution

2016-02-12 Thread Wolfgang Bumiller
From: Jens Vehlhaber Signed-off-by: Jens Vehlhaber --- src/PVE/LXC.pm | 4 ++-- src/PVE/LXC/Setup.pm| 5 - src/PVE/LXC/Setup/Alpine.pm | 48 + 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 src/PVE/LXC