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

CA-271945: Attempting to resolve the pool's connection and searching for it in all open connections for the EnableHAAction in case a host has been destroyed or the master changed.

Browse Source 
Preventing an Object (host) has been deleted error when attempting to reenable Maintenance Mode on a Host that has been kicked out of the pool when exiting the RPU Wizard.
Returning null to prevent making orphened tasks that will be stuck at 0% completion if it is impossible to fulfill.

Signed-off-by: Aaron Robson <aaron.robson@citrix.com>
This commit is contained in:
Aaron Robson 2018-10-22 09:33:50 +01:00 committed by Konstantina Chremmou
parent 6353043b15
commit 7accaadb26
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XenAdmin/Diagnostics/Problems/HostProblem/HostMaintenanceMode.cs
View File

@ -63,8 +63,12 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override AsyncAction CreateUnwindChangesAction()
{
Program.MainWindow.CloseActiveWizards(Server.Connection);
return new DisableHostAction(Server);
var server = Server.Connection.Resolve(new XenRef<Host>(Server.opaque_ref));
if (server == null)
return null;
Program.MainWindow.CloseActiveWizards(server.Connection);
return new DisableHostAction(server);
}
}

13
XenAdmin/Diagnostics/Problems/PoolProblem/HAEnabledProblem.cs
View File

@ -58,7 +58,18 @@ namespace XenAdmin.Diagnostics.Problems.PoolProblem
public override AsyncAction CreateUnwindChangesAction()
{
return new EnableHAAction(Pool, null, HeartbeatSrs, FailuresToTolerate);
var pool = Pool.Connection.Resolve(new XenRef<Pool>(Pool.opaque_ref));
if (pool == null)
{
foreach (var xenConnection in ConnectionsManager.XenConnectionsCopy)
{
pool = xenConnection.Resolve(new XenRef<Pool>(Pool.opaque_ref));
if (pool != null)
break;
}
}
return pool != null ? new EnableHAAction(pool, null, HeartbeatSrs, FailuresToTolerate) : null;
}
public override string Description

3
XenAdmin/Diagnostics/Problems/VMProblem/AutoStartEnabled.cs
View File

@ -88,6 +88,9 @@ namespace XenAdmin.Diagnostics.Problems.VMProblem
public override AsyncAction CreateUnwindChangesAction()
{
if (VM.Connection.Resolve(new XenRef<VM>(VM.opaque_ref)) == null) // check if the vm is still in the cache
return null;
return new DelegatedAsyncAction(
VM.Connection,
Messages.ACTION_ENABLE_AUTOSTART_ON_VM,