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

Feature #2065: Attach disk for VMs in poweroff

Browse Source
This commit is contained in:
Carlos Martín 2015-03-18 16:28:43 +01:00
parent c25492d1a3
commit 757f908ff5
5 changed files with 176 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/LifeCycleManager.h
View File

@ -213,8 +213,6 @@ private:
void attach_success_action(int vid);
void delete_attach_disk(int vid, bool release_save_as);
void attach_failure_action(int vid);
void detach_success_action(int vid);

17
include/VirtualMachinePool.h
View File

@ -339,6 +339,23 @@ public:
int end_year,
string &error_str);
/**
* Deletes the DISK that was in the process of being attached. Releases
* Images and updates usage quotas
*
* @param vid VM id
* @param release_save_as true to release non-persistent images
* in the detach event
*/
void delete_attach_disk(int vid, bool release_save_as);
/**
* Deletes the NIC that was in the process of being attached
*
* @param vid VM id
*/
void delete_attach_nic(int vid);
private:
/**
* Factory method to produce VM objects

42
src/dm/DispatchManagerActions.cc
View File

@ -1474,8 +1474,9 @@ int DispatchManager::attach_nic(
return -1;
}
if ( vm->get_state() != VirtualMachine::ACTIVE ||
vm->get_lcm_state() != VirtualMachine::RUNNING )
if (( vm->get_state() != VirtualMachine::ACTIVE ||
vm->get_lcm_state() != VirtualMachine::RUNNING ) &&
vm->get_state() != VirtualMachine::POWEROFF )
{
oss << "Could not add a new NIC to VM " << vid << ", wrong state.";
error_str = oss.str();
@ -1498,7 +1499,11 @@ int DispatchManager::attach_nic(
vm->get_security_groups(vm_sgs);
if (vm->get_state() == VirtualMachine::ACTIVE &&
vm->get_lcm_state() == VirtualMachine::RUNNING )
{
vm->set_state(VirtualMachine::HOTPLUG_NIC);
}
vm->set_resched(false);
@ -1552,7 +1557,10 @@ int DispatchManager::attach_nic(
delete *it;
}
if (vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC)
{
vm->set_state(VirtualMachine::RUNNING);
}
vmpool->update(vm);
@ -1567,12 +1575,21 @@ int DispatchManager::attach_nic(
vm->set_attach_nic(nic, sg_rules);
}
if (vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC)
{
vmm->trigger(VirtualMachineManager::ATTACH_NIC,vid);
}
else
{
vm->log("DiM", Log::INFO, "VM NIC Successfully attached.");
vm->clear_attach_nic();
}
vmpool->update(vm);
vm->unlock();
vmm->trigger(VirtualMachineManager::ATTACH_NIC,vid);
return 0;
}
@ -1600,8 +1617,9 @@ int DispatchManager::detach_nic(
return -1;
}
if ( vm->get_state() != VirtualMachine::ACTIVE ||
vm->get_lcm_state() != VirtualMachine::RUNNING )
if (( vm->get_state() != VirtualMachine::ACTIVE ||
vm->get_lcm_state() != VirtualMachine::RUNNING ) &&
vm->get_state() != VirtualMachine::POWEROFF )
{
oss << "Could not detach NIC from VM " << vid << ", wrong state.";
error_str = oss.str();
@ -1624,6 +1642,9 @@ int DispatchManager::detach_nic(
return -1;
}
if (vm->get_state() == VirtualMachine::ACTIVE &&
vm->get_lcm_state() == VirtualMachine::RUNNING )
{
vm->set_state(VirtualMachine::HOTPLUG_NIC);
vm->set_resched(false);
@ -1633,6 +1654,15 @@ int DispatchManager::detach_nic(
vm->unlock();
vmm->trigger(VirtualMachineManager::DETACH_NIC,vid);
}
else
{
vm->unlock();
vmpool->delete_attach_nic(vid);
vm->log("DiM", Log::INFO, "VM NIC Successfully detached.");
}
return 0;
}

101
src/lcm/LifeCycleStates.cc
View File

@ -1451,73 +1451,6 @@ void LifeCycleManager::attach_success_action(int vid)
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
void LifeCycleManager::delete_attach_disk(int vid, bool release_save_as)
{
VirtualMachine * vm;
VectorAttribute * disk;
int uid;
int gid;
int oid;
vm = vmpool->get(vid,true);
if ( vm == 0 )
{
return;
}
disk = vm->delete_attach_disk();
uid = vm->get_uid();
gid = vm->get_gid();
oid = vm->get_oid();
vmpool->update(vm);
vm->unlock();
if ( disk != 0 )
{
Nebula& nd = Nebula::instance();
ImageManager* imagem = nd.get_imagem();
Template tmpl;
int image_id;
tmpl.set(disk);
if ( disk->vector_value("IMAGE_ID", image_id) == 0 )
{
// Disk using an Image
Quotas::quota_del(Quotas::IMAGE, uid, gid, &tmpl);
imagem->release_image(oid, image_id, false);
// Release non-persistent images in the detach event
if (release_save_as)
{
int save_as_id;
if ( disk->vector_value("SAVE_AS", save_as_id) == 0 )
{
imagem->release_image(oid, save_as_id, false);
}
}
}
else // Volatile disk
{
// It is an update of the volatile counter without
// shutting destroying a VM
tmpl.add("VMS", 0);
Quotas::quota_del(Quotas::VM, uid, gid, &tmpl);
}
}
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
void LifeCycleManager::attach_failure_action(int vid)
{
VirtualMachine * vm;
@ -1534,7 +1467,7 @@ void LifeCycleManager::attach_failure_action(int vid)
{
vm->unlock();
delete_attach_disk(vid, false);
vmpool->delete_attach_disk(vid, false);
vm = vmpool->get(vid,true);
@ -1584,7 +1517,7 @@ void LifeCycleManager::detach_success_action(int vid)
{
vm->unlock();
delete_attach_disk(vid, true);
vmpool->delete_attach_disk(vid, true);
vm = vmpool->get(vid,true);
@ -1853,11 +1786,6 @@ void LifeCycleManager::attach_nic_success_action(int vid)
void LifeCycleManager::attach_nic_failure_action(int vid)
{
VirtualMachine * vm;
VectorAttribute * nic;
int uid;
int gid;
int oid;
vm = vmpool->get(vid,true);
@ -1868,27 +1796,22 @@ void LifeCycleManager::attach_nic_failure_action(int vid)
if ( vm->get_lcm_state() == VirtualMachine::HOTPLUG_NIC )
{
nic = vm->delete_attach_nic();
uid = vm->get_uid();
gid = vm->get_gid();
oid = vm->get_oid();
vm->unlock();
vmpool->delete_attach_nic(vid);
vm = vmpool->get(vid,true);
if ( vm == 0 )
{
return;
}
vm->set_state(VirtualMachine::RUNNING);
vmpool->update(vm);
vm->unlock();
if ( nic != 0 )
{
Template tmpl;
tmpl.set(nic);
Quotas::quota_del(Quotas::NETWORK, uid, gid, &tmpl);
VirtualMachine::release_network_leases(nic, oid);
}
}
else
{

104
src/vm/VirtualMachinePool.cc
View File

@ -1035,3 +1035,107 @@ int VirtualMachinePool::calculate_showback(
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
void VirtualMachinePool::delete_attach_disk(int vid, bool release_save_as)
{
VirtualMachine * vm;
VectorAttribute * disk;
int uid;
int gid;
int oid;
vm = get(vid,true);
if ( vm == 0 )
{
return;
}
disk = vm->delete_attach_disk();
uid = vm->get_uid();
gid = vm->get_gid();
oid = vm->get_oid();
update(vm);
vm->unlock();
if ( disk != 0 )
{
Nebula& nd = Nebula::instance();
ImageManager* imagem = nd.get_imagem();
Template tmpl;
int image_id;
tmpl.set(disk);
if ( disk->vector_value("IMAGE_ID", image_id) == 0 )
{
// Disk using an Image
Quotas::quota_del(Quotas::IMAGE, uid, gid, &tmpl);
imagem->release_image(oid, image_id, false);
// Release non-persistent images in the detach event
if (release_save_as)
{
int save_as_id;
if ( disk->vector_value("SAVE_AS", save_as_id) == 0 )
{
imagem->release_image(oid, save_as_id, false);
}
}
}
else // Volatile disk
{
// It is an update of the volatile counter without
// shutting destroying a VM
tmpl.add("VMS", 0);
Quotas::quota_del(Quotas::VM, uid, gid, &tmpl);
}
}
}
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
void VirtualMachinePool::delete_attach_nic(int vid)
{
VirtualMachine * vm;
VectorAttribute * nic;
int uid;
int gid;
int oid;
vm = get(vid,true);
if ( vm == 0 )
{
return;
}
nic = vm->delete_attach_nic();
uid = vm->get_uid();
gid = vm->get_gid();
oid = vm->get_oid();
update(vm);
vm->unlock();
if ( nic != 0 )
{
Template tmpl;
tmpl.set(nic);
Quotas::quota_del(Quotas::NETWORK, uid, gid, &tmpl);
VirtualMachine::release_network_leases(nic, oid);
}
}