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 F244670B18 for ; Thu, 30 Sep 2021 13:42:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3255B1ED92 for ; Thu, 30 Sep 2021 13:42:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 6A2F91ED0D for ; Thu, 30 Sep 2021 13:42:19 +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 4249744C53 for ; Thu, 30 Sep 2021 13:42:19 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 30 Sep 2021 13:42:03 +0200 Message-Id: <20210930114215.240095-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [cifsplugin.pm, btrfsplugin.pm, plugin.pm, storage.pm, cephfsplugin.pm, nfsplugin.pm, pbsplugin.pm, content.pm, prunebackups.pm, dirplugin.pm, proxmox.com, vzdump.pm] URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence Subject: [pve-devel] [PATCH-SERIES v2 manager/storage] fix #3307: allow backups to be marked as protected 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: Thu, 30 Sep 2021 11:42:23 -0000 Protected bacukps cannot be removed accidentally and will be ignored for pruning. A .protected file serves as a protection marker for file-based storages. Changes from v1: * Avoid races when using unlink. * Also add fall-back for {get, update}_volume_notes to other plugin implementations, because external plugins might be derived from those too. * Add UI integration patches. For the storage part, an APIAGE+APIVER bump is needed. Dependency bump from pve-manager to pve-storage is needed. To work, the PBS integration needs Dominik's patches for PBS (seems like a rebase is needed for those, I tested on top of v2.0.10): https://lists.proxmox.com/pipermail/pbs-devel/2021-September/004099.html pve-storage: Fabian Ebner (7): dir plugin: update notes: don't fail if file is already removed dir plugin: get notes: return undef if notes are not supported add generalized functions to manage volume attributes prune mark: preserve additional information for the keep-all case fix #3307: make it possible to set protection for backups prune: mark renamed and protected backups differently pbs: integrate support for protected PVE/API2/Storage/Content.pm | 36 ++++++++++--- PVE/API2/Storage/PruneBackups.pm | 5 +- PVE/Storage.pm | 23 +++++--- PVE/Storage/BTRFSPlugin.pm | 4 +- PVE/Storage/CIFSPlugin.pm | 13 +++++ PVE/Storage/CephFSPlugin.pm | 12 +++++ PVE/Storage/DirPlugin.pm | 62 +++++++++++++++++++++- PVE/Storage/NFSPlugin.pm | 13 +++++ PVE/Storage/PBSPlugin.pm | 90 +++++++++++++++++++++++++++++++- PVE/Storage/Plugin.pm | 45 +++++++++++++++- test/prune_backups_test.pm | 17 +++++- 11 files changed, 296 insertions(+), 24 deletions(-) pve-manager: Fabian Ebner (5): vzdump: skip protected backups for dumpdir pruning ui: storage content: avoid redundant options hasNotesColumn and hideColumns ui: backup views: add protected column ui: backup views: add button to change protection status ui: prune: also handle new 'renamed' keep reason PVE/VZDump.pm | 7 +++++++ www/manager6/grid/BackupView.js | 25 +++++++++++++++++++++++++ www/manager6/storage/BackupView.js | 18 ++++++++++++++++++ www/manager6/storage/Browser.js | 1 - www/manager6/storage/ContentView.js | 20 ++++++++++++++------ www/manager6/window/Prune.js | 2 ++ 6 files changed, 66 insertions(+), 7 deletions(-) -- 2.30.2