shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

feature #1224: split HOTPLUG state into HOTPLUG & HOTPLUG_SNAPSHOT

Browse Source
This commit is contained in:
Ruben S. Montero 2013-02-28 02:49:56 +01:00
parent 7c81925207
commit 78e71d42ce
11 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/VirtualMachine.h
View File

@ -89,7 +89,8 @@ public:
BOOT_POWEROFF = 20,
BOOT_SUSPENDED = 21,
BOOT_STOPPED = 22,
CLEANUP_DELETE = 23
CLEANUP_DELETE = 23,
HOTPLUG_SNAPSHOT = 24
};
// -------------------------------------------------------------------------

3
share/doc/xsd/acct.xsd
View File

@ -106,7 +106,8 @@
BOOT_POWEROFF = 20,
BOOT_SUSPENDED = 21,
BOOT_STOPPED = 22,
CLEANUP_DELETE = 23
CLEANUP_DELETE = 23,
HOTPLUG_SNAPSHOT = 24
-->
<xs:element name="LCM_STATE" type="xs:integer"/>
<xs:element name="RESCHED" type="xs:integer"/>

3
share/doc/xsd/vm.xsd
View File

@ -68,7 +68,8 @@
BOOT_POWEROFF = 20,
BOOT_SUSPENDED = 21,
BOOT_STOPPED = 22,
CLEANUP_DELETE = 23
CLEANUP_DELETE = 23,
HOTPLUG_SNAPSHOT = 24
-->
<xs:element name="LCM_STATE" type="xs:integer"/>
<xs:element name="RESCHED" type="xs:integer"/>

6
src/dm/DispatchManagerActions.cc
View File

@ -1116,7 +1116,7 @@ int DispatchManager::snapshot_create(
return -1;
}
vm->set_state(VirtualMachine::HOTPLUG);
vm->set_state(VirtualMachine::HOTPLUG_SNAPSHOT);
vm->set_resched(false);
@ -1187,7 +1187,7 @@ int DispatchManager::snapshot_revert(
return -1;
}
vm->set_state(VirtualMachine::HOTPLUG);
vm->set_state(VirtualMachine::HOTPLUG_SNAPSHOT);
vm->set_resched(false);
@ -1255,7 +1255,7 @@ int DispatchManager::snapshot_delete(
return -1;
}
vm->set_state(VirtualMachine::HOTPLUG);
vm->set_state(VirtualMachine::HOTPLUG_SNAPSHOT);
vm->set_resched(false);

1
src/lcm/LifeCycleActions.cc
View File

@ -738,6 +738,7 @@ void LifeCycleManager::clean_up_vm(VirtualMachine * vm, bool dispose)
case VirtualMachine::SHUTDOWN_POWEROFF:
case VirtualMachine::CANCEL:
case VirtualMachine::HOTPLUG:
case VirtualMachine::HOTPLUG_SNAPSHOT:
vm->set_running_etime(the_time);
vmpool->update_history(vm);

10
src/lcm/LifeCycleStates.cc
View File

@ -1231,7 +1231,7 @@ void LifeCycleManager::snapshot_create_success(int vid)
return;
}
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_SNAPSHOT )
{
vm->clear_active_snapshot();
@ -1261,7 +1261,7 @@ void LifeCycleManager::snapshot_create_failure(int vid)
return;
}
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_SNAPSHOT )
{
vm->delete_active_snapshot();
@ -1294,7 +1294,7 @@ void LifeCycleManager::snapshot_revert_success(int vid)
return;
}
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_SNAPSHOT )
{
vm->clear_active_snapshot();
@ -1334,7 +1334,7 @@ void LifeCycleManager::snapshot_delete_success(int vid)
return;
}
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_SNAPSHOT )
{
vm->delete_active_snapshot();
@ -1364,7 +1364,7 @@ void LifeCycleManager::snapshot_delete_failure(int vid)
return;
}
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG )
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_SNAPSHOT )
{
vm->clear_active_snapshot();

6
src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java
View File

@ -91,7 +91,8 @@ public class VirtualMachine extends PoolElement{
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED",
"CLEANUP_DELETE" };
"CLEANUP_DELETE",
"HOTPLUG_SNAPSHOT" };
private static final String[] SHORT_LCM_STATES =
{
@ -118,7 +119,8 @@ public class VirtualMachine extends PoolElement{
"boot",
"boot",
"boot",
"clea" };
"clea",
"snap" };
/**
* Creates a new VM representation.

6
src/oca/ruby/opennebula/virtual_machine.rb
View File

@ -49,7 +49,8 @@ module OpenNebula
LCM_STATE=%w{LCM_INIT PROLOG BOOT RUNNING MIGRATE SAVE_STOP SAVE_SUSPEND
SAVE_MIGRATE PROLOG_MIGRATE PROLOG_RESUME EPILOG_STOP EPILOG
SHUTDOWN CANCEL FAILURE CLEANUP_RESUBMIT UNKNOWN HOTPLUG SHUTDOWN_POWEROFF
BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED CLEANUP_DELETE}
BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED CLEANUP_DELETE
HOTPLUG_SNAPSHOT}
SHORT_VM_STATES={
"INIT" => "init",
@ -86,7 +87,8 @@ module OpenNebula
"BOOT_POWEROFF" => "boot",
"BOOT_SUSPENDED" => "boot",
"BOOT_STOPPED" => "boot",
"CLEANUP_DELETE" => "clea"
"CLEANUP_DELETE" => "clea",
"HOTPLUG_SNAPSHOT" => "snap"
}
MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL}

3
src/ozones/Server/public/js/ozones.js
View File

@ -102,7 +102,8 @@ var oZones = {
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED",
"CLEANUP_DELETE"][value]);
"CLEANUP_DELETE",
"HOTPLUG_SNAPSHOT"][value]);
break;
case "IMAGE":
case "image":

3
src/sunstone/public/js/opennebula.js
View File

@ -110,7 +110,8 @@ var OpenNebula = {
"BOOT_POWEROFF",
"BOOT_SUSPENDED",
"BOOT_STOPPED",
"CLEANUP_DELETE"][value]);
"CLEANUP_DELETE",
"HOTPLUG_SNAPSHOT"][value]);
break;
case "IMAGE":
case "image":

4
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -50,7 +50,7 @@ var vm_graphs = [
];
var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE"];
var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE", "HOTPLUG_SNAPSHOT"];
//Permanent storage for last value of aggregated network usage
//Used to calculate bandwidth
@ -1649,4 +1649,4 @@ $(document).ready(function(){
infoListener(dataTable_vMachines,'VM.showinfo');
$('div#vms_tab div.legend_div').hide();
})
})