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

Feature #3932, #3801: Minor fix, error formatting

Browse Source
This commit is contained in:
Carlos Martín 2016-05-05 12:29:39 +02:00
parent 1ac996957c
commit f362b7ca85
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/dm/DispatchManagerActions.cc
View File

@ -65,7 +65,8 @@ int DispatchManager::deploy (
error:
oss.str("");
oss << "Could not deploy VM " << vid << ", wrong state.";
oss << "Could not deploy VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
vm->unlock();
@ -169,7 +170,8 @@ int DispatchManager::migrate(
error:
oss.str("");
oss << "Could not migrate VM " << vid << ", wrong state.";
oss << "Could not migrate VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
vm->unlock();
@ -211,7 +213,8 @@ int DispatchManager::live_migrate(
error:
oss.str("");
oss << "Could not live-migrate VM " << vid << ", wrong state.";
oss << "Could not live-migrate VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
vm->unlock();
@ -309,7 +312,8 @@ int DispatchManager::terminate(
default:
oss.str("");
oss << "Could not terminate VM " << vid << ", wrong state.";
oss << "Could not terminate VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
error_str = oss.str();
@ -369,7 +373,8 @@ int DispatchManager::undeploy(
error:
oss.str("");
oss << "Could not undeploy VM " << vid << ", wrong state.";
oss << "Could not undeploy VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -425,7 +430,8 @@ int DispatchManager::poweroff (
error:
oss.str("");
oss << "Could not power off VM " << vid << ", wrong state.";
oss << "Could not power off VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -473,7 +479,8 @@ int DispatchManager::hold(
error:
oss.str("");
oss << "Could not hold VM " << vid << ", wrong state.";
oss << "Could not hold VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -520,7 +527,8 @@ int DispatchManager::release(
error:
oss.str("");
oss << "Could not release VM " << vid << ", wrong state.";
oss << "Could not release VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -567,7 +575,8 @@ int DispatchManager::stop(
error:
oss.str("");
oss << "Could not stop VM " << vid << ", wrong state.";
oss << "Could not stop VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -613,7 +622,8 @@ int DispatchManager::suspend(
error:
oss.str("");
oss << "Could not suspend VM " << vid << ", wrong state.";
oss << "Could not suspend VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -671,7 +681,8 @@ int DispatchManager::resume(
error:
oss.str("");
oss << "Could not resume VM " << vid << ", wrong state.";
oss << "Could not resume VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -729,7 +740,8 @@ int DispatchManager::reboot(
error:
oss.str("");
oss << "Could not reboot VM " << vid << ", wrong state.";
oss << "Could not reboot VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -779,7 +791,8 @@ int DispatchManager::resched(
error:
oss.str("");
oss << "Could not set rescheduling flag for VM " << vid << ", wrong state.";
oss << "Could not set rescheduling flag for VM " << vid
<< ", wrong state " << vm->state_str() << ".";
NebulaLog::log("DiM",Log::ERROR,oss);
oss.str("");
@ -817,7 +830,12 @@ int DispatchManager::recover(VirtualMachine * vm, bool success, string& error)
default:
rc = -1;
error = "Cannot recover VM operation";
ostringstream oss;
oss << "Could not perform a recover operation on VM " << vm->get_oid()
<< ", wrong state " << vm->state_str() << ".";
error = oss.str();
break;
}
@ -841,7 +859,12 @@ int DispatchManager::retry(VirtualMachine * vm, string& error)
default:
rc = -1;
error = "The VM operation cannot be retried";
ostringstream oss;
oss << "Could not perform a retry on VM " << vm->get_oid()
<< ", wrong state " << vm->state_str() << ".";
error = oss.str();
break;
}

4
src/vrouter/VirtualRouter.cc
View File

@ -19,7 +19,7 @@
#include "Nebula.h"
#include "VirtualMachine.h"
static const History::VMAction action[12] = {
static const History::VMAction action[11] = {
History::MIGRATE_ACTION,
History::LIVE_MIGRATE_ACTION,
History::HOLD_ACTION,
@ -33,7 +33,7 @@ static const History::VMAction action[12] = {
History::DISK_SNAPSHOT_DELETE_ACTION
};
const ActionSet<History::VMAction> VirtualRouter::SUPPORTED_ACTIONS(action, 12);
const ActionSet<History::VMAction> VirtualRouter::SUPPORTED_ACTIONS(action, 11);
/* ************************************************************************ */
/* VirtualRouter :: Constructor/Destructor */