From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH v2 storage 1/2] rbd: improve handling of missing images
Date: Tue, 18 Jul 2023 09:26:31 +0200 [thread overview]
Message-ID: <9d8f50b4-ff4a-dbe8-3234-ca7896f6c37d@proxmox.com> (raw)
In-Reply-To: <20230614111022.1432946-1-a.lauterer@proxmox.com>
ping?
On 6/14/23 13:10, Aaron Lauterer wrote:
> It can happen, that an RBD image isn't cleaned up 100%. Calling 'rbd ls
> -l' will then show errors that it is not possible to open the image in
> question:
> ```
> rbd: error opening vm-103-disk-1: (2) No such file or directory
> rbd: listing images failed: (2) No such file or directory
> ```
>
> Originally we only showed the last error line which is too generic and
> doesn't give a good hint what is actually wrong.
>
> We can improve that by catching these specific errors and add the
> problematic disk images to the returned list with a size of '-1'.
>
> When the 'rbd rm' command is used on such an image, it will clean up
> whatever is still left.
> But for that to work, we also need to handle these errors in the
> 'rbd_ls_snap' sub as it is called from 'free_image'.
>
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> no changes since v1
>
> src/PVE/Storage/RBDPlugin.pm | 52 +++++++++++++++++++++++++++++++-----
> 1 file changed, 46 insertions(+), 6 deletions(-)
>
> diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
> index f45ad3f..c4e4467 100644
> --- a/src/PVE/Storage/RBDPlugin.pm
> +++ b/src/PVE/Storage/RBDPlugin.pm
> @@ -169,6 +169,8 @@ my $krbd_feature_update = sub {
> }
> };
>
> +my $missing_image_err_regex = '((?:vm|base)-\d+-.*): \(2\) No such file or directory$';
> +
> sub run_rbd_command {
> my ($cmd, %args) = @_;
>
> @@ -207,13 +209,28 @@ sub rbd_ls {
> my $raw = '';
> my $parser = sub { $raw .= shift };
>
> + my $show_err = 1;
> + my $missing_images = {};
> + my $err_parser = sub {
> + my $line = shift;
> + if ($line =~ m/$missing_image_err_regex/) {
> + $show_err = 0;
> + $missing_images->{$1} = 1;
> + } elsif ($line ne "rbd: listing images failed: (2) No such file or directory") {
> + # this generic error is shown after the image specific "No such file..." one,
> + # ignore it but not other errors
> + $show_err = 1;
> + die $line;
> + }
> + };
> +
> my $cmd = $rbd_cmd->($scfg, $storeid, 'ls', '-l', '--format', 'json');
> eval {
> - run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
> + run_rbd_command($cmd, errmsg => "rbd error", errfunc => $err_parser, outfunc => $parser);
> };
> my $err = $@;
>
> - die $err if $err && $err !~ m/doesn't contain rbd images/ ;
> + die $err if $err && $show_err && $err !~ m/doesn't contain rbd images/ ;
>
> my $result;
> if ($raw eq '') {
> @@ -224,6 +241,13 @@ sub rbd_ls {
> die "got unexpected data from rbd ls: '$raw'\n";
> }
>
> + for my $image (keys %$missing_images) {
> + push @$result, {
> + image => $image,
> + size => -1,
> + };
> + }
> +
> my $list = {};
>
> foreach my $el (@$result) {
> @@ -251,7 +275,20 @@ sub rbd_ls_snap {
> my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'ls', $name, '--format', 'json');
>
> my $raw = '';
> - run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => sub { $raw .= shift; });
> + my $show_err = 0;
> + my $err_parser = sub {
> + my $line = shift;
> + if ($line !~ m/$missing_image_err_regex/) {
> + $show_err = 1;
> + die $line;
> + }
> + };
> + eval {
> + run_rbd_command($cmd, errmsg => "rbd error", errfunc => $err_parser, outfunc => sub { $raw .= shift; });
> + };
> + my $err = $@;
> + die $err if $err && $show_err;
> + return {} if $err && !$show_err; # could not open image, probably missing
>
> my $list;
> if ($raw =~ m/^(\[.*\])$/s) { # untaint
> @@ -633,10 +670,13 @@ sub free_image {
>
> $class->deactivate_volume($storeid, $scfg, $volname);
>
> - my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'purge', $name);
> - run_rbd_command($cmd, errmsg => "rbd snap purge '$name' error");
>
> - $cmd = $rbd_cmd->($scfg, $storeid, 'rm', $name);
> + if (keys %{$snaps}) {
> + my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'purge', $name);
> + run_rbd_command($cmd, errmsg => "rbd snap purge '$name' error");
> + }
> +
> + my $cmd = $rbd_cmd->($scfg, $storeid, 'rm', $name);
> run_rbd_command($cmd, errmsg => "rbd rm '$name' error");
>
> return undef;
next prev parent reply other threads:[~2023-07-18 7:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 11:10 Aaron Lauterer
2023-06-14 11:10 ` [pve-devel] [PATCH v2 manager 2/2] ui: ContentView: don't show size if it is -1 Aaron Lauterer
2023-07-18 7:26 ` Aaron Lauterer [this message]
2023-08-21 15:05 ` [pve-devel] [PATCH v2 storage 1/2] rbd: improve handling of missing images Fiona Ebner
2023-08-22 9:42 ` Aaron Lauterer
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=9d8f50b4-ff4a-dbe8-3234-ca7896f6c37d@proxmox.com \
--to=a.lauterer@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