From fb7f5ef2d0c1ea1d62f40d5566a84593dd1ff7bb Mon Sep 17 00:00:00 2001
From: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Date: Thu, 5 Mar 2020 00:04:18 +0000
Subject: [PATCH] CA-335356: If the GFS2 probe cannot find devices, do not
 prevent the user from creating LVMoHBA SRs.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
---
 XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
index 9fc725bd9..6153105fb 100644
--- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
+++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
@@ -216,7 +216,6 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
 
         private bool RunProbe(Host master, FibreChannelDescriptor srDescriptor, out List<SR.SRInfo> srs)
         {
-            srs = null;
             var action = new SrProbeAction(Connection, master, srDescriptor.SrType, srDescriptor.DeviceConfig);
 
             using (var dlg = new ActionProgressDialog(action, ProgressBarStyle.Marquee))
@@ -234,6 +233,14 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
                     return false;
                 }
             }
+
+            srs = new List<SR.SRInfo>();
+
+            //CA-335356 special treatment of case where gfs2 cannot see the same devices as lvmohba
+            if (srDescriptor.SrType == SR.SRTypes.gfs2 && action.Exception is Failure f && f.ErrorDescription.Count > 1 &&
+                f.ErrorDescription[0].StartsWith("SR_BACKEND_FAILURE") && f.ErrorDescription[1] == "DeviceNotFoundException")
+                return true;
+
             return false;
         }