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 E1A1960222 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 D15398E8E 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 512268E52 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 1B0D145D61 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:26 +0200 Message-Id: <20201014113628.14286-4-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.045 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. [lxc.pm] Subject: [pve-devel] [PATCH container 3/5] remove replicated volumes on purge 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 Signed-off-by: Fabian Ebner --- src/PVE/API2/LXC.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 9ecfb12..9fc7d98 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -15,6 +15,7 @@ use PVE::Firewall; use PVE::Storage; use PVE::RESTHandler; use PVE::RPCEnvironment; +use PVE::Replication; use PVE::ReplicationConfig; use PVE::LXC; use PVE::LXC::Create; @@ -694,7 +695,14 @@ __PACKAGE__->register_method({ PVE::Firewall::remove_vmfw_conf($vmid); if ($param->{purge}) { print "purging CT $vmid from related configurations..\n"; - PVE::ReplicationConfig::remove_vmid_jobs($vmid); + + my $repl_conf = PVE::ReplicationConfig->new(); + my $jobs = $repl_conf->list_local_jobs($vmid); + foreach my $job (@{$jobs}) { + eval { PVE::Replication::run_full_removal('PVE::LXC::Config', $job); }; + warn $@ if $@; + } + PVE::VZDump::Plugin::remove_vmid_from_backup_jobs($vmid); if ($ha_managed) { -- 2.20.1