From: Christoph Heiss <c.heiss@proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH manager v2] pvesh: decode streamed responses
Date: Thu, 19 Oct 2023 09:28:24 +0200 [thread overview]
Message-ID: <aqjpb4cwrge5nzwjxndbzcx6zxeesh7u5xif26wmnfgd6h2tdx@hgsj4ymian23> (raw)
In-Reply-To: <20230607141511.560351-1-c.heiss@proxmox.com>
Ping, still applies.
On Wed, Jun 07, 2023 at 04:15:11PM +0200, Christoph Heiss wrote:
>
> This allows to use `pvesh` on endpoints like /nodes/{node}/journal,
> which return streamed (and possibly gzip'd) responses.
>
> Currently, e.g. `pvesh get /nodes/localhost/journal --lastentries 10`
> fails with:
>
> gzip: stdout: Broken pipe
> got hash object, but result schema specified array!
>
> Using e.g. `--output-format yaml` resulted in:
>
> ---
> download:
> content-encoding: gzip
> content-type: application/json
> fh: &1 !!perl/ref
> =: *1
> stream: 1
>
> gzip: stdout: Broken pipe
> Failed to write
>
> This is due the API call returning a "download" object (as seen above),
> which contains (among some other things) a file handle to read the
> response from.
>
> With this patch, the response from such endpoints is now correctly read
> and displayed. Only handles combinations of `Content-Encoding` == 'gzip'
> and either 'text/plain' or 'application/json' for `Content-Type`.
>
> This tries to mimic the behavior of the API server implementation when
> encountering `download` objects.
>
> Tested this with all four output formats 'text', 'json', 'json-pretty'
> and 'yaml', as well as "cross-node" in a local test cluster.
>
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
> Changes v1 -> v2:
> * Fix some style nits
> * Move content-{encoding,type} checks before actual decoding
>
> As far as I could see (aka. grep for it), the only two endpoints which
> implement this are /nodes/{node}/journal and
> /nodes/{node}/tasks/{upid}/log, latter one only with `--download 1`
> set.
>
> PVE/CLI/pvesh.pm | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/PVE/CLI/pvesh.pm b/PVE/CLI/pvesh.pm
> index 9acf292a..c0c8187b 100755
> --- a/PVE/CLI/pvesh.pm
> +++ b/PVE/CLI/pvesh.pm
> @@ -15,6 +15,7 @@ use PVE::CLIHandler;
> use PVE::API2Tools;
> use PVE::API2;
> use JSON;
> +use IO::Uncompress::Gunzip qw(gunzip);
>
> use base qw(PVE::CLIHandler);
>
> @@ -281,6 +282,41 @@ my $cond_add_standard_output_properties = sub {
> return PVE::RESTHandler::add_standard_output_properties($props, $keys);
> };
>
> +my $handle_streamed_response = sub {
> + my ($download) = @_;
> + my ($fh, $path, $encoding, $type) =
> + $download->@{'fh', 'path', 'content-encoding', 'content-type'};
> +
> + die "{download} returned but neither fh nor path given\n"
> + if !defined($fh) && !defined($path);
> +
> + die "unknown 'content-encoding' $encoding\n"
> + if defined($encoding) && $encoding ne 'gzip';
> +
> + die "unknown 'content-type' $type\n"
> + if defined($type) && $type !~ qw!^(text/plain)|(application/json)$!;
> +
> + if (defined($path)) {
> + open($fh, '<', $path)
> + or die "open stream path '$path' for reading failed: $!\n";
> + }
> +
> + local $/;
> + my $data = <$fh>;
> +
> + if (defined($encoding)) {
> + my $out;
> + gunzip(\$data => \$out);
> + $data = $out;
> + }
> +
> + if (defined($type) && $type eq 'application/json') {
> + $data = decode_json($data)->{data};
> + }
> +
> + return $data;
> +};
> +
> sub call_api_method {
> my ($cmd, $param) = @_;
>
> @@ -310,6 +346,9 @@ sub call_api_method {
> }
>
> $data = $handler->handle($info, $param);
> +
> + $data = &$handle_streamed_response($data->{download})
> + if ref($data) eq 'HASH' && ref($data->{download}) eq 'HASH';
> }
>
> return if $opt_nooutput || $stdopts->{quiet};
> --
> 2.40.1
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
next prev parent reply other threads:[~2023-10-19 7:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 14:15 Christoph Heiss
2023-10-19 7:28 ` Christoph Heiss [this message]
2023-10-21 14:36 ` [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=aqjpb4cwrge5nzwjxndbzcx6zxeesh7u5xif26wmnfgd6h2tdx@hgsj4ymian23 \
--to=c.heiss@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