From 66e3e528afaaeae1ee0be17839fb521d1247ebdb Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Wed, 18 Nov 2020 09:24:18 +0200 Subject: [PATCH 1/2] Removed sensitive info from UI when attach/detach fails --- .../cloud/storage/resource/VmwareStorageProcessor.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java index 85aacd34f42c..7e02cc3a771e 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -2248,15 +2248,16 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean String msg = ""; if (isAttach) { - msg += "Failed to attach volume: " + e.getMessage(); + msg += "Failed to attach volume"; } else { - msg += "Failed to detach volume: " + e.getMessage(); + msg += "Failed to detach volume"; } - s_logger.error(msg, e); + s_logger.error(msg + e.getMessage(), e); - return new AttachAnswer(msg); + // Sending empty error message - too many duplicate errors in UI + return new AttachAnswer(""); } } From 62ce2dc61447ab1b7b2ff9698c2302d4ba999f27 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Wed, 18 Nov 2020 09:40:37 +0200 Subject: [PATCH 2/2] minor formatting change --- .../com/cloud/storage/resource/VmwareStorageProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java index 7e02cc3a771e..1584bd003dc4 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -2248,10 +2248,10 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean String msg = ""; if (isAttach) { - msg += "Failed to attach volume"; + msg += "Failed to attach volume: "; } else { - msg += "Failed to detach volume"; + msg += "Failed to detach volume: "; } s_logger.error(msg + e.getMessage(), e);