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

CA-184521: On the Storage page of New VM wizard, the SR selection is ignored

Browse Source 
Fixed issues where total initial allocation for an SR was not calculated correctly. Also some minor improvements.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-10-06 14:04:36 +01:00
parent 4d3064c733
commit 80f855b981
3 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
XenAdmin/Wizards/NewVMWizard/Page_Storage.cs
View File

@ -238,10 +238,11 @@ namespace XenAdmin.Wizards.NewVMWizard
else
totalDiskSize[sr.opaque_ref] = item.Disk.virtual_size;
var initialSpace = Helpers.GetRequiredSpaceToCreateVdiOnSr(sr, item.Disk);
if (totalDiskInitialAllocation.ContainsKey(sr.opaque_ref))
totalDiskInitialAllocation[sr.opaque_ref] += item.Disk.InitialAllocation;
totalDiskInitialAllocation[sr.opaque_ref] += initialSpace;
else
totalDiskInitialAllocation[sr.opaque_ref] = item.Disk.InitialAllocation;
totalDiskInitialAllocation[sr.opaque_ref] = initialSpace;
}
DiskOverCommit overcommitedDisk = DiskOverCommit.None;
foreach (DiskGridRowItem item in DisksGridView.Rows)
@ -517,7 +518,9 @@ namespace XenAdmin.Wizards.NewVMWizard
}
/// <summary>
/// returns null if nothing suitable
/// Tries to find the best SR for the given VDI considering the suggestedSR which has priority over other SRs in this check.
/// SuggestedSR, default SR, other SRs are checked.
/// Returns first suitable SR or NULL.
/// </summary>
private static SR GetBeskDiskStorage(IXenConnection connection, VDI disk, Host affinity, SR suggestedSR)
{
@ -536,36 +539,21 @@ namespace XenAdmin.Wizards.NewVMWizard
if (!sr.CanCreateVmOn())
continue;
if (sr.IsThinProvisioned && sr.CanBeSeenFrom(affinity) && IsSufficientFreeSpaceAvailableOnSrForVdi(sr, disk))
if (sr.CanBeSeenFrom(affinity) && IsSufficientFreeSpaceAvailableOnSrForVdi(sr, disk))
return sr;
}
// there is nothing
return null;
// there has been no suitable SR found
return null;
}
private static long GetRequiredSpaceToCreateVdiOnSr(SR sr, VDI disk)
{
if (sr == null)
throw new ArgumentNullException("sr");
long initialAllocationVdi = -1;
if (disk.sm_config != null && disk.sm_config.ContainsKey("initial_allocation"))
long.TryParse(disk.sm_config["initial_allocation"], out initialAllocationVdi);
long initialAllocationSr = -1;
if (sr.IsThinProvisioned && sr.sm_config.ContainsKey("initial_allocation") && sr.sm_config != null)
long.TryParse(sr.sm_config["initial_allocation"], out initialAllocationSr);
return (initialAllocationSr > -1 || initialAllocationVdi > -1) ? Math.Max(initialAllocationSr, initialAllocationVdi) : disk.virtual_size;
}
/// <summary>
/// Checks whether there is enough space available on the SR to accommodate a VDI.
/// </summary>
private static bool IsSufficientFreeSpaceAvailableOnSrForVdi(SR sr, VDI disk)
{
if (sr == null)
return false;
return sr.FreeSpace > GetRequiredSpaceToCreateVdiOnSr(sr, disk);
return sr != null && !sr.IsFull && sr.FreeSpace > Helpers.GetRequiredSpaceToCreateVdiOnSr(sr, disk);
}
}

30
XenModel/Utils/Helpers.cs
View File

@ -2113,5 +2113,35 @@ namespace XenAdmin.Core
var master = GetMaster(connection);
return CreamOrGreater(connection) && master != null && master.SuppPacks.Any(suppPack => suppPack.Name.ToLower().StartsWith("xscontainer"));
}
/// <summary>
/// This method returns the disk space required (bytes) on the provided SR for the provided VDI.
/// This method also considers thin provisioning. For thin provisioned SRs the provided sm_config in the VDI will be considered first, or it will use the values from the SR's sm_config in case the VDI does not have these set. For fully provisioned SRs the sm_config in the VDI will be ignored.
/// </summary>
/// <returns>Disk size required in bytes.</returns>
public static long GetRequiredSpaceToCreateVdiOnSr(SR sr, VDI vdi)
{
if (sr == null)
throw new ArgumentNullException("sr");
if (vdi == null)
throw new ArgumentNullException("vdi");
long initialAllocationVdi = -1;
if (vdi.sm_config != null && vdi.sm_config.ContainsKey("initial_allocation"))
long.TryParse(vdi.sm_config["initial_allocation"], out initialAllocationVdi);
long initialAllocationSr = -1;
if (sr.IsThinProvisioned && sr.sm_config.ContainsKey("initial_allocation") && sr.sm_config != null)
long.TryParse(sr.sm_config["initial_allocation"], out initialAllocationSr);
if (initialAllocationVdi > -1)
return initialAllocationVdi;
if (initialAllocationSr > -1)
return initialAllocationSr;
return vdi.virtual_size;
}
}
}

14
XenModel/XenAPI-Extensions/VDI.cs
View File

@ -361,18 +361,6 @@ namespace XenAPI
NO_RO_IMAGE, // no part of the VDI is read-only => nothing to cache
SR_OVERRIDE, // the feature has been explicitly disabled for the VDI's SR
}
public long InitialAllocation
{
get
{
long initialAllocation;
if (sm_config != null && sm_config.ContainsKey("initial_allocation") && long.TryParse(sm_config["initial_allocation"], out initialAllocation))
{
return initialAllocation;
}
return virtual_size;
}
}
}
}