[pve-devel] [PATCH storage 1/2] activate storage: improve error when check_connection dies

[pve-devel] [PATCH storage 1/2] activate storage: improve error when check_connection dies

[Fabian Ebner]

by making sure the storage ID is part of the error. This can happen
for (at least) CIFS, and GlusterFS with local server.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/Storage.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index d64019f..40972c9 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1056,7 +1056,8 @@ sub activate_storage {
 	activate_storage($cfg, $baseid, $cache);
     }
 
-    if (!$plugin->check_connection($storeid, $scfg)) {
+    if (! eval { $plugin->check_connection($storeid, $scfg) }) {
+	die "connection check for storage '$storeid' failed - $@\n" if $@;
 	die "storage '$storeid' is not online\n";
     }
 
-- 
2.30.2

[pve-devel] [PATCH storage 2/2] cifs: check connection: bubble up NT_STATUS_LOGON_FAILURE

[Fabian Ebner]

in the same manner as NT_STATUS_ACCESS_DENIED. It can be assumed to be
a configuration error, so avoid showing the generic "storage <storeid>
is not online". Reported in the community forum:
https://forum.proxmox.com/threads/storage-is-not-online-cifs.99201/post-428858

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/Storage/CIFSPlugin.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm
index a3f9ebe..d5efa5f 100644
--- a/PVE/Storage/CIFSPlugin.pm
+++ b/PVE/Storage/CIFSPlugin.pm
@@ -280,7 +280,7 @@ sub check_connection {
 
     if (my $err = $@) {
 	die "$out_str\n" if defined($out_str) &&
-	    ($out_str =~ m/NT_STATUS_ACCESS_DENIED/);
+	    ($out_str =~ m/NT_STATUS_(ACCESS_DENIED|LOGON_FAILURE)/);
 	return 0;
     }
 
-- 
2.30.2

[pve-devel] applied: [PATCH storage 1/2] activate storage: improve error when check_connection dies

[Thomas Lamprecht]

On 15.11.21 13:37, Fabian Ebner wrote:
> by making sure the storage ID is part of the error. This can happen
> for (at least) CIFS, and GlusterFS with local server.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/Storage.pm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH storage 2/2] cifs: check connection: bubble up NT_STATUS_LOGON_FAILURE

[Thomas Lamprecht]

On 15.11.21 13:37, Fabian Ebner wrote:
> in the same manner as NT_STATUS_ACCESS_DENIED. It can be assumed to be
> a configuration error, so avoid showing the generic "storage <storeid>
> is not online". Reported in the community forum:
> https://forum.proxmox.com/threads/storage-is-not-online-cifs.99201/post-428858
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/Storage/CIFSPlugin.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!