public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Mira Limbeck <m.limbeck@proxmox.com>
Subject: [pve-devel] applied: [PATCH v3 storage] fix insecure migration failing if waiting on lock
Date: Wed, 17 Apr 2024 12:32:44 +0200	[thread overview]
Message-ID: <2a785b1f-8fbf-443e-8e93-0a34bbce45a6@proxmox.com> (raw)
In-Reply-To: <20240417094857.58520-1-m.limbeck@proxmox.com>

Am 17/04/2024 um 11:48 schrieb Mira Limbeck:
> both STDOUT and STDERR are written into `$info` which is then parsed for
> IP and port of the target socket listening.
> when the ports file can't be locked immediately `trying to acquire
> lock...` is printed on STDERR and in turn written into `$info`.
> trying to parse the IP then fails, resulting in a migration or
> replication failing.
> 
> the bare open3 call is replaced by the run_command wrapper from
> pve-common to use a safe wrapper around open3 with the same
> functionality.
> STDERR is read separatey from STDOUT and the last line of STDERR is
> kept in case of errors.
> 
> Fixes: 57acd6a ("fix #1452: also log stderr of remote command with
> insecure storage migration")
> 
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
> v3:
>  - added log prefix for remote error logs
>  - fixed style issues
> 
> v2:
>  - incorporated Fiona's suggestions
>    - added `Fixes: ...` to commit message
>    - kept old ip/port matching including # untaint comments
>    - added logging for all messages in STDERR
>    - simplified branches
> 
>  src/PVE/Storage.pm | 91 ++++++++++++++++++++++++++++------------------
>  1 file changed, 55 insertions(+), 36 deletions(-)
> 
>

applied, thanks!


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


WARNING: multiple messages have this Message-ID
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Mira Limbeck <m.limbeck@proxmox.com>
Subject: [pve-devel] applied: [PATCH v3 storage] fix insecure migration failing if waiting on lock
Date: Wed, 17 Apr 2024 12:32:44 +0200	[thread overview]
Message-ID: <2a785b1f-8fbf-443e-8e93-0a34bbce45a6@proxmox.com> (raw)
Message-ID: <20240417103244.YZXPg2B6bGimqQus2EZG6tcNL-AoZ88P27pJrdGkfnM@z> (raw)
In-Reply-To: <20240417094857.58520-1-m.limbeck@proxmox.com>

Am 17/04/2024 um 11:48 schrieb Mira Limbeck:
> both STDOUT and STDERR are written into `$info` which is then parsed for
> IP and port of the target socket listening.
> when the ports file can't be locked immediately `trying to acquire
> lock...` is printed on STDERR and in turn written into `$info`.
> trying to parse the IP then fails, resulting in a migration or
> replication failing.
> 
> the bare open3 call is replaced by the run_command wrapper from
> pve-common to use a safe wrapper around open3 with the same
> functionality.
> STDERR is read separatey from STDOUT and the last line of STDERR is
> kept in case of errors.
> 
> Fixes: 57acd6a ("fix #1452: also log stderr of remote command with
> insecure storage migration")
> 
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
> v3:
>  - added log prefix for remote error logs
>  - fixed style issues
> 
> v2:
>  - incorporated Fiona's suggestions
>    - added `Fixes: ...` to commit message
>    - kept old ip/port matching including # untaint comments
>    - added logging for all messages in STDERR
>    - simplified branches
> 
>  src/PVE/Storage.pm | 91 ++++++++++++++++++++++++++++------------------
>  1 file changed, 55 insertions(+), 36 deletions(-)
> 
>

applied, thanks!




  reply	other threads:[~2024-04-17 10:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-17  9:48 [pve-devel] " Mira Limbeck
2024-04-17 10:32 ` Thomas Lamprecht [this message]
2024-04-17 10:32   ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2a785b1f-8fbf-443e-8e93-0a34bbce45a6@proxmox.com \
    --to=t.lamprecht@proxmox.com \
    --cc=m.limbeck@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal