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-250145: XenCenter cannot shutdown VM as VmPowerAdmin user if HA is enabled

Browse Source 
The error was happening because of the Pool.sync_database call (when HA is enabled and the VM has a saved restart priority other than DoNotRestart) which requires pool admin or pool operator roles.
This call is not needed, so removing it.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2017-04-27 15:19:35 +01:00 committed by Stephen Turner
parent 3c861b0b7a
commit 76b3c05b9a
2 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
XenModel/Actions/VM/VMShutdownAction.cs
View File

@ -45,25 +45,6 @@ namespace XenAdmin.Actions.VMActions
this.Host = vm.Home(); this.Host = vm.Home();
this.Pool = Core.Helpers.GetPool(vm.Connection); this.Pool = Core.Helpers.GetPool(vm.Connection);
} }
/// <summary>
/// Enables or disables HA protection for a VM (VM.ha_always_run). Also does a pool.sync_database afterwards.
/// May throw a XenAPI.Failure.
/// </summary>
/// <param name="protect"></param>
/// <param name="act"></param>
/// <param name="session"></param>
/// <param name="vm"></param>
/// <param name="start"></param>
/// <param name="end"></param>
protected static void SetHaProtection(bool protect, AsyncAction action, VM vm, int start, int end)
{
// Do database sync. Helps to ensure that the change persists over master failover.
action.RelatedTask = XenAPI.Pool.async_sync_database(action.Session);
action.PollToCompletion(start, end);
}
} }
public class VMCleanShutdown : VMShutdownAction public class VMCleanShutdown : VMShutdownAction
@ -75,17 +56,10 @@ namespace XenAdmin.Actions.VMActions
protected override void Run() protected override void Run()
{ {
bool vmHasSavedRestartPriority = VM.HasSavedRestartPriority;
this.Description = Messages.ACTION_VM_SHUTTING_DOWN; this.Description = Messages.ACTION_VM_SHUTTING_DOWN;
if (vmHasSavedRestartPriority) RelatedTask = VM.async_clean_shutdown(Session, VM.opaque_ref);
{ PollToCompletion(0, 100);
// Disable HA protection
SetHaProtection(false, this, VM, 0, 50);
}
RelatedTask = XenAPI.VM.async_clean_shutdown(Session, VM.opaque_ref);
PollToCompletion(vmHasSavedRestartPriority ? 50 : 0, 100);
this.Description = Messages.ACTION_VM_SHUT_DOWN; this.Description = Messages.ACTION_VM_SHUT_DOWN;
} }
} }
@ -99,16 +73,10 @@ namespace XenAdmin.Actions.VMActions
protected override void Run() protected override void Run()
{ {
bool vmHasSavedRestartPriority =VM.HasSavedRestartPriority;
this.Description = Messages.ACTION_VM_SHUTTING_DOWN; this.Description = Messages.ACTION_VM_SHUTTING_DOWN;
if (vmHasSavedRestartPriority) RelatedTask = VM.async_hard_shutdown(Session, VM.opaque_ref);
{ PollToCompletion(0, 100);
// Disable HA protection
SetHaProtection(false, this, VM, 0, 70);
}
RelatedTask = XenAPI.VM.async_hard_shutdown(Session, VM.opaque_ref);
PollToCompletion(vmHasSavedRestartPriority ? 70 : 0, 100);
this.Description = Messages.ACTION_VM_SHUT_DOWN; this.Description = Messages.ACTION_VM_SHUT_DOWN;
} }

12
XenModel/Actions/VM/VMSuspendAction.cs
View File

@ -42,19 +42,11 @@ namespace XenAdmin.Actions.VMActions
VM = vm; VM = vm;
} }
protected override void Run() protected override void Run()
{ {
var vmHasSavedRestartPriority = VM.HasSavedRestartPriority;
this.Description = Messages.ACTION_VM_SUSPENDING; this.Description = Messages.ACTION_VM_SUSPENDING;
if (vmHasSavedRestartPriority) RelatedTask = VM.async_suspend(Session, VM.opaque_ref);
{ PollToCompletion(0, 100);
// Disable HA protection
SetHaProtection(false, this, VM, 0, 50);
}
RelatedTask = XenAPI.VM.async_suspend(Session, VM.opaque_ref);
PollToCompletion(vmHasSavedRestartPriority ? 50 : 0, 100);
this.Description = Messages.ACTION_VM_SUSPENDED; this.Description = Messages.ACTION_VM_SUSPENDED;
} }
} }