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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9138B60BFC for ; Fri, 27 Nov 2020 10:36:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7EB1F19E0E for ; Fri, 27 Nov 2020 10:35:50 +0100 (CET) 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 C672919E02 for ; Fri, 27 Nov 2020 10:35:48 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 91A9A45CFA for ; Fri, 27 Nov 2020 10:35:48 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 27 Nov 2020 10:35:44 +0100 Message-Id: <20201127093544.17667-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 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. [pbsplugin.pm, lvmplugin.pm, cephfsplugin.pm, proxmox.com, rbdplugin.pm, zfspoolplugin.pm, cifsplugin.pm] Subject: [pve-devel] [PATCH storage] plugin: hooks: add explicit returns 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: Fri, 27 Nov 2020 09:36:20 -0000 to avoid returning something unexpected. Finish what afeda182566292be15413d9b874720876eac14c9 already started for all the other plugins. At least for ZFS's on_add_hook this is necessary (adding a ZFS storage currently fails as reported here [0]), but it cannot hurt in the other places either as the only hooks we expect to return something currently are PBS's on_add_hook and on_update_hook. [0]: https://forum.proxmox.com/threads/gui-add-zfs-storage-verification-failed-400-config-type-check-object-failed.79734/ Signed-off-by: Fabian Ebner --- PVE/Storage/CIFSPlugin.pm | 6 ++++++ PVE/Storage/CephFSPlugin.pm | 4 ++++ PVE/Storage/LVMPlugin.pm | 2 ++ PVE/Storage/PBSPlugin.pm | 2 ++ PVE/Storage/RBDPlugin.pm | 4 ++++ PVE/Storage/ZFSPoolPlugin.pm | 2 ++ 6 files changed, 20 insertions(+) diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm index 7ec7164..36339db 100644 --- a/PVE/Storage/CIFSPlugin.pm +++ b/PVE/Storage/CIFSPlugin.pm @@ -168,6 +168,8 @@ sub on_add_hook { } else { cifs_delete_credentials($storeid); } + + return; } sub on_update_hook { @@ -183,12 +185,16 @@ sub on_update_hook { } else { cifs_delete_credentials($storeid); } + + return; } sub on_delete_hook { my ($class, $storeid, $scfg) = @_; cifs_delete_credentials($storeid); + + return; } sub status { diff --git a/PVE/Storage/CephFSPlugin.pm b/PVE/Storage/CephFSPlugin.pm index 880ec05..8eb7c70 100644 --- a/PVE/Storage/CephFSPlugin.pm +++ b/PVE/Storage/CephFSPlugin.pm @@ -170,6 +170,8 @@ sub on_add_hook { return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid); + + return; } sub on_delete_hook { @@ -178,6 +180,8 @@ sub on_delete_hook { return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid); + + return; } sub status { diff --git a/PVE/Storage/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm index c0740d4..73e8e48 100644 --- a/PVE/Storage/LVMPlugin.pm +++ b/PVE/Storage/LVMPlugin.pm @@ -269,6 +269,8 @@ sub on_add_hook { lvm_create_volume_group($path, $scfg->{vgname}, $scfg->{shared}); } + + return; } sub parse_volname { diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index d1db4a9..380c976 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -452,6 +452,8 @@ sub on_delete_hook { pbs_delete_password($scfg, $storeid); pbs_delete_encryption_key($scfg, $storeid); + + return; } sub parse_volname { diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 94df89d..fab6d57 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -317,6 +317,8 @@ sub on_add_hook { return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid); + + return; } sub on_delete_hook { @@ -325,6 +327,8 @@ sub on_delete_hook { return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid); + + return; } sub parse_volname { diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 2f0a80a..3054331 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -133,6 +133,8 @@ sub on_add_hook { } else { $scfg->{mountpoint} = $mountpoint; } + + return; } sub path { -- 2.20.1