From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9C3A4601AF for ; Wed, 14 Oct 2020 13:36:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 98C858E85 for ; Wed, 14 Oct 2020 13:36:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 387B78E49 for ; Wed, 14 Oct 2020 13:36:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 07BA545D5D for ; Wed, 14 Oct 2020 13:36:34 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 14 Oct 2020 13:36:24 +0200 Message-Id: <20201014113628.14286-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201014113628.14286-1-f.ebner@proxmox.com> References: <20201014113628.14286-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replication.pm, replicationconfig.pm] Subject: [pve-devel] [PATCH guest-common 1/5] add list_local_jobs and run_full_removal functions X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2020 11:36:35 -0000 helpful for removing replicated volumes when purging a guest. Signed-off-by: Fabian Ebner --- 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