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-211369: focus of the machine/console switching back to the vm post snapshot with disk and memory is performed incorrectly/misleading (#1019)

Browse Source 
[CA-211369] Console switching when snapshot completes

ConsolePanel.setCurrentSource() being called in ConsolePanel.Snapshot() was causing the console view to switch to the target snapshotted VM's console, but only if the user is already on a console tab. The screenshot now happens before the snapshot begins, instead of after; this way, the screenshot always occurs when not on the console tab.

Signed-off-by: Frederico Mazzone <fredericom@citrite.net>
This commit is contained in:
Frezzle 2016-06-22 16:27:14 +01:00 committed by Mihaela Stoica
parent 57f359561a
commit 07a62a703d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
XenModel/Actions/VM/VMSnapshotCreateAction.cs
View File

@ -76,7 +76,21 @@ namespace XenAdmin.Actions
protected override void Run()
{
Description = Messages.SNAPSHOTTING;
// Take screenshot before snapshot begins, to avoid possible console switching (CA-211369)
// The screenshot is optional. If it throws an exception, we will do without it. CA-37095/CA-37103.
Image snapshot = null;
try
{
if (VM.power_state == vm_power_state.Running && m_Type == SnapshotType.DISK_AND_MEMORY)
{
// use the sudo credentials for the snapshot (can be null) (CA-91132)
snapshot = _screenShotProvider(VM, sudoUsername, sudoPassword);
}
}
catch (Exception)
{
}
if (m_Type == SnapshotType.QUIESCED_DISK)
{
@ -97,21 +111,7 @@ namespace XenAdmin.Actions
string newVmRef = taskResult.Substring(7, taskResult.Length - 15);
XenAPI.VM.set_name_description(Session, newVmRef, m_NewDescription);
// The screenshot is optional. If it throws an exception, we will do without it. CA-37095/CA-37103.
try
{
if (VM.power_state == vm_power_state.Running && m_Type == SnapshotType.DISK_AND_MEMORY)
{
// use the sudo credentials for the snapshot (can be null) (CA-91132)
using (Image snapshot = _screenShotProvider(VM, sudoUsername, sudoPassword))
{
SaveImageInBlob(newVmRef, snapshot);
}
}
}
catch (Exception)
{
}
SaveImageInBlob(newVmRef, snapshot);
Description = Messages.SNAPSHOTTED;
}