Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-252923: Update apply on slave host fails with pool_patch or pool_update not found

Browse Source 
In rare cases, the GetMaster could return null, causing the update progress to fail with "Pool_patch or Pool_update not found". (when the Cache hasn't been populated by the execution gets here)
This commit drops GetMaster and uses a pre-saved masterUuid instead of waiting for the Cache what would be the other way to solve this issue.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2017-05-12 15:31:59 +01:00
parent 1bc43eda7d
commit d55af4e5a7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/Wizards/PatchingWizard/PlanActions/ApplyXenServerPatchPlanAction.cs
View File

@ -42,6 +42,7 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
private readonly Host host;
private readonly XenServerPatch xenServerPatch;
private readonly List<PoolPatchMapping> mappings;
private readonly string masterUuid;
public ApplyXenServerPatchPlanAction(Host host, XenServerPatch xenServerPatch, List<PoolPatchMapping> mappings)
: base(host.Connection, string.Format(Messages.UPDATES_WIZARD_APPLYING_UPDATE, xenServerPatch.Name, host.Name))
@ -49,14 +50,15 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
this.host = host;
this.xenServerPatch = xenServerPatch;
this.mappings = mappings;
var master = Helpers.GetMaster(host.Connection);
this.masterUuid = master.uuid;
}
protected override void RunWithSession(ref Session session)
{
var master = Helpers.GetMaster(host.Connection);
var mapping = mappings.Find(m => m.XenServerPatch.Equals(xenServerPatch)
&& m.MasterHost != null && master != null && m.MasterHost.uuid == master.uuid);
&& m.MasterHost != null && m.MasterHost.uuid == masterUuid);
if (mapping != null && (mapping.Pool_patch != null || mapping.Pool_update != null))
{
@ -75,8 +77,8 @@ namespace XenAdmin.Wizards.PatchingWizard.PlanActions
}
else
{
if (xenServerPatch != null && master != null)
log.ErrorFormat("Mapping not found for patch {0} on master {1}", xenServerPatch.Uuid, master.uuid);
if (xenServerPatch != null)
log.ErrorFormat("Mapping not found for patch {0} on master {1}", xenServerPatch.Uuid, masterUuid);
throw new Exception("Pool_patch or Pool_update not found.");
}