shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Bug #2471: Update log messages that refer to deprecated actions

Browse Source
This commit is contained in:
Carlos Martín 2013-11-25 16:08:37 +01:00
parent 9eba97912c
commit 444e729f03
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dm/DispatchManagerActions.cc
View File

@ -926,13 +926,13 @@ int DispatchManager::resubmit(int vid)
{
case VirtualMachine::POWEROFF:
NebulaLog::log("DiM",Log::ERROR,
"Cannot resubmit a powered off VM. Resume it first");
"Cannot delete-recreate a powered off VM. Resume it first");
rc = -2;
break;
case VirtualMachine::SUSPENDED:
NebulaLog::log("DiM",Log::ERROR,
"Cannot resubmit a suspended VM. Resume it first");
"Cannot delete-recreate a suspended VM. Resume it first");
rc = -2;
break;
@ -968,7 +968,7 @@ int DispatchManager::resubmit(int vid)
case VirtualMachine::DONE:
NebulaLog::log("DiM",Log::ERROR,
"Cannot resubmit a VM already in DONE state");
"Cannot delete-recreate a VM already in DONE state");
rc = -2;
break;
}

2
src/rm/RequestManagerVirtualMachine.cc
View File

@ -1085,7 +1085,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis
failure_response(INTERNAL,
request_error("VM has to be RUNNING, POWEROFF or"
" SUSPENDED to saveas disks.",""), att);
" SUSPENDED to snapshot disks.",""), att);
return;
}

6
src/vmm/VirtualMachineManagerDriver.cc
View File

@ -372,11 +372,11 @@ void VirtualMachineManagerDriver::protocol(const string& message) const
{
if (result == "SUCCESS")
{
vm->log("VMM",Log::INFO,"VM successfully reset.");
vm->log("VMM",Log::INFO,"VM successfully rebooted-hard.");
}
else
{
log_error(vm,os,is,"Error resetting VM, assume it's still running");
log_error(vm,os,is,"Error rebooting-hard VM, assume it's still running");
vmpool->update(vm);
}
}
@ -681,7 +681,7 @@ void VirtualMachineManagerDriver::process_poll(
case 'd': //The VM was not found
vm->log("VMM", Log::INFO, "VM running but it was not found."
" Restart and delete actions available or try to"
" Boot and delete actions available or try to"
" recover it manually");
lcm->trigger(LifeCycleManager::MONITOR_DONE, vm->get_oid());