From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: Re: [pve-devel] [PATCH qemu-server] fix backpu/restore with ipv6/ports for pbs
Date: Thu, 3 Dec 2020 10:27:58 +0100 [thread overview]
Message-ID: <eb5115dc-d63d-b03b-16ec-36c3651d4127@proxmox.com> (raw)
In-Reply-To: <20201203084309.24838-1-d.csapak@proxmox.com>
On 03.12.20 09:43, Dominik Csapak wrote:
> by copying the 'get_server_with_port' from PVE::Storage::PBSPlugin
> here and using it for generating the server
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> ideally we would make the get_server_with_port sub in pve-storage
> public and use it here (like we do e.g. in container with
> 'run_raw_client_cmd') or even push that stuff into
we actually want to remove all run_raw_client_cmd usage, because it has no
checks and is pretty raw - a clean interface would be much nicer..
> PVE::PBSClient module in comment to reuse that here and in pve-storage
>
> but to avoid the dependency bumps and fix it fast, this
> should be enough for now
>
I know I said to try to avoid the need for dependency bumps if possible, so
this one is one me.
> PVE/QemuServer.pm | 14 +++++++++++++-
> PVE/VZDump/QemuServer.pm | 3 ++-
> 2 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 4989938..7170230 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -6050,6 +6050,18 @@ sub rescan {
> }
> }
>
> +sub pbs_get_server_with_port {
> + my ($scfg) = @_;
> +
> + my $server = $scfg->{server};
> + $server = "[$server]" if $server =~ /^$IPV6RE$/;
> +
> + if (my $port = $scfg->{port}) {
> + $server .= ":$port" if $port != 8007;
> + }
> + return $server;
> +}
> +
> sub restore_proxmox_backup_archive {
> my ($archive, $vmid, $user, $options) = @_;
>
> @@ -6058,7 +6070,7 @@ sub restore_proxmox_backup_archive {
> my ($storeid, $volname) = PVE::Storage::parse_volume_id($archive);
> my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
>
> - my $server = $scfg->{server};
> + my $server = pbs_get_server_with_port($scfg);
> my $datastore = $scfg->{datastore};
> my $username = $scfg->{username} // 'root@pam';
> my $fingerprint = $scfg->{fingerprint};
a few lines below, just out of context we see the sole use for all this extracting:
my $repo = "$username\@$server:$datastore";
So how about adding a get_repo sub to storage, or the PBSClient in pve-common
(if we have a documented datastructure like scfg to get the info sanely from).
> diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
> index 5003676..57436e6 100644
> --- a/PVE/VZDump/QemuServer.pm
> +++ b/PVE/VZDump/QemuServer.pm
> @@ -473,7 +473,8 @@ sub archive_pbs {
>
> my $starttime = time();
>
> - my $server = $scfg->{server};
> + my $server = PVE::QemuServer::pbs_get_server_with_port($scfg);
> +
> my $datastore = $scfg->{datastore};
> my $username = $scfg->{username} // 'root@pam';
> my $fingerprint = $scfg->{fingerprint};
>
next prev parent reply other threads:[~2020-12-03 9:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 8:43 Dominik Csapak
2020-12-03 9:27 ` Thomas Lamprecht [this message]
2020-12-03 9:40 ` Dominik Csapak
2020-12-03 9:46 ` 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=eb5115dc-d63d-b03b-16ec-36c3651d4127@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=d.csapak@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