Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 12:30:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-4946: PR-1634: Bulk import of FibreChannel LUNs in DR Wizard.

Browse Source 
1. Modified RunCheck method in AssertCanBeRecoveredCheck.cs to always take
into account SR passed in ErrorDescription.
2. Format Description in MissingMultipleFCSRsProblem.cs.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
This commit is contained in:
Adrian Jachacy 2013-06-28 10:24:12 +01:00
parent 6e2b3fc40f
commit 2a29743ecb
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
XenAdmin/Diagnostics/Checks/DR/AssertCanBeRecoveredCheck.cs
View File

@ -112,26 +112,30 @@ namespace XenAdmin.Diagnostics.Checks.DR
{
if (f.ErrorDescription.Count > 2 && f.ErrorDescription[0] == Failure.VM_REQUIRES_SR)
{
List<SR> requiredSRs = GetRequiredSRs(xenObject);
if (requiredSRs != null)
{
//search for local SRs
SR localSR = requiredSRs.Find(item => !item.shared);
if (localSR != null)
{
// there is local SR which means the VM cannot be recovered
return new MissingSRProblem(this, Pool, localSR, null);
}
List<SR> requiredSRs = GetRequiredSRs(xenObject) ?? new List<SR>();
//search for FibreChannel SRs
List<SRDeviceConfig> srDeviceConfigList = GetFCSRDeviceConfigList(requiredSRs);
if (srDeviceConfigList.Count > 0)
return new MissingMultipleFCSRsProblem(this, Pool, srDeviceConfigList);
SR sr = RetrieveSR(new XenRef<SR>(f.ErrorDescription[2]));
if (!requiredSRs.Contains(sr))
requiredSRs.Add(sr);
//search for local SRs
SR localSR = requiredSRs.Find(item => !item.shared);
if (localSR != null)
{
// there is local SR which means the VM cannot be recovered
return new MissingSRProblem(this, Pool, localSR, null);
}
XenRef<SR> srRef = new XenRef<SR>(f.ErrorDescription[2]);
SR sr = SR.get_record(MetadataSession, srRef);
return new MissingSRProblem(this, Pool, sr, null);
//search for FibreChannel SRs
List<SRDeviceConfig> srDeviceConfigList = GetFCSRDeviceConfigList(requiredSRs);
if (srDeviceConfigList.Count == 0)
return new MissingSRProblem(this, Pool, requiredSRs[0], null);
if (srDeviceConfigList.Count == 1)
return new MissingSRProblem(this, Pool, srDeviceConfigList[0].SR,
srDeviceConfigList[0].DeviceConfig);
return new MissingMultipleFCSRsProblem(this, Pool, srDeviceConfigList);
}
}
catch (Exception e)

2
XenAdmin/Diagnostics/Problems/PoolProblem/MissingMultipleFCSRsProblem.cs
View File

@ -36,7 +36,7 @@ namespace XenAdmin.Diagnostics.Problems.PoolProblem
if (EmptySRDeviceConfigList)
return Messages.DR_WIZARD_PROBLEM_MISSING_MULTIPLE_SRS_NO_INFO;
return Messages.DR_WIZARD_PROBLEM_MISSING_MULTIPLE_SRS;
return string.Format(Messages.DR_WIZARD_PROBLEM_MISSING_MULTIPLE_SRS, srDeviceConfigList.Count);
}
}