From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH guest-common 1/5] add list_local_jobs and run_full_removal functions
Date: Wed, 14 Oct 2020 13:36:24 +0200 [thread overview]
Message-ID: <20201014113628.14286-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201014113628.14286-1-f.ebner@proxmox.com>
helpful for removing replicated volumes when purging a guest.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/Replication.pm | 11 +++++++++++
PVE/ReplicationConfig.pm | 7 +++++++
2 files changed, 18 insertions(+)
diff --git a/PVE/Replication.pm b/PVE/Replication.pm
index 132e8bb..a2138fc 100644
--- a/PVE/Replication.pm
+++ b/PVE/Replication.pm
@@ -425,4 +425,15 @@ sub run_replication {
return $volumes;
}
+sub run_full_removal {
+ my ($guest_class, $jobcfg) = @_;
+
+ my $start_time = time();
+ my $logfunc = sub { print shift . "\n"; };
+
+ $jobcfg->{remove_job} = 'full';
+
+ run_replication($guest_class, $jobcfg, $start_time, $start_time, $logfunc);
+}
+
1;
diff --git a/PVE/ReplicationConfig.pm b/PVE/ReplicationConfig.pm
index 66ef842..77905a0 100644
--- a/PVE/ReplicationConfig.pm
+++ b/PVE/ReplicationConfig.pm
@@ -228,6 +228,13 @@ sub find_local_replication_job {
return undef;
}
+sub list_local_jobs {
+ my ($cfg, $vmid) = @_;
+
+ my @jobs = grep { $_->{type} eq 'local' && $_->{guest} == $vmid } values %{$cfg->{ids}};
+ return \@jobs;
+}
+
# switch local replication job target
sub switch_replication_job_target {
my ($vmid, $old_target, $new_target) = @_;
--
2.20.1
next prev parent reply other threads:[~2020-10-14 11:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 11:36 [pve-devel] [PATCH-SERIES] remove replicated volumes on guest purge Fabian Ebner
2020-10-14 11:36 ` Fabian Ebner [this message]
2020-10-14 11:36 ` [pve-devel] [PATCH qemu-server 2/5] remove replicated volumes on purge Fabian Ebner
2020-10-14 11:36 ` [pve-devel] [PATCH container 3/5] " Fabian Ebner
2020-10-14 11:36 ` [pve-devel] [PATCH guest-common 4/5] remove the now unused remove_vmid_jobs Fabian Ebner
2020-10-14 11:36 ` [pve-devel] [PATCH guest-common 5/5] cleanup: iterate over values in find_local_replication_job Fabian Ebner
2021-01-28 16:20 ` [pve-devel] [PATCH-SERIES] remove replicated volumes on guest purge Thomas Lamprecht
2021-01-29 10:12 ` Fabian Ebner
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=20201014113628.14286-2-f.ebner@proxmox.com \
--to=f.ebner@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