mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
Bug #1306: Use the tm_mad stored in the history, instead of the system_ds tm_mad
This commit is contained in:
1 parent
d5b40785f5
commit
ffc99eea2f
4 files changed
+162
-135
No files matched your search
+118
-104
@@ -212,7 +212,7 @@ void TransferManager::do_action(const string &action, void * arg)
|
||||
int TransferManager::prolog_transfer_command(
|
||||
VirtualMachine * vm,
|
||||
const VectorAttribute * disk,
|
||||
string& system_tm_mad,
|
||||
string& vm_tm_mad,
|
||||
string& opennebula_hostname,
|
||||
ostream& xfr,
|
||||
ostringstream& os)
|
||||
@@ -248,7 +248,7 @@ int TransferManager::prolog_transfer_command(
|
||||
|
||||
//MKSWAP tm_mad size host:remote_system_dir/disk.i vmid dsid(=0)
|
||||
xfr << "MKSWAP "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< size << " "
|
||||
<< vm->get_hostname() << ":"
|
||||
<< vm->get_remote_system_dir() << "/disk." << disk_index << " "
|
||||
@@ -273,7 +273,7 @@ int TransferManager::prolog_transfer_command(
|
||||
|
||||
//MKIMAGE tm_mad size format host:remote_system_dir/disk.i vmid dsid(=0)
|
||||
xfr << "MKIMAGE "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< size << " "
|
||||
<< format << " "
|
||||
<< vm->get_hostname() << ":"
|
||||
@@ -356,7 +356,7 @@ void TransferManager::prolog_action(int vid)
|
||||
const VectorAttribute * disk;
|
||||
|
||||
string files;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string opennebula_hostname;
|
||||
int rc;
|
||||
string error_str;
|
||||
@@ -374,17 +374,6 @@ void TransferManager::prolog_action(int vid)
|
||||
// -------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// -------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "prolog, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::PROLOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -397,6 +386,14 @@ void TransferManager::prolog_action(int vid)
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
vm_tm_mad = vm->get_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".prolog";
|
||||
xfr.open(xfr_name.c_str(), ios::out | ios::trunc);
|
||||
|
||||
@@ -423,7 +420,7 @@ void TransferManager::prolog_action(int vid)
|
||||
|
||||
rc = prolog_transfer_command(vm,
|
||||
disk,
|
||||
system_tm_mad,
|
||||
vm_tm_mad,
|
||||
opennebula_hostname,
|
||||
xfr,
|
||||
os);
|
||||
@@ -447,7 +444,7 @@ void TransferManager::prolog_action(int vid)
|
||||
{
|
||||
//CONTEXT tm_mad files hostname:remote_system_dir/disk.i vmid dsid(=0)
|
||||
xfr << "CONTEXT "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< vm->get_context_file() << " ";
|
||||
|
||||
if (!files.empty())
|
||||
@@ -472,6 +469,11 @@ error_history:
|
||||
os << "VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "prolog, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os << "could not open file: " << xfr_name;
|
||||
goto error_common;
|
||||
@@ -505,7 +507,7 @@ void TransferManager::prolog_migr_action(int vid)
|
||||
|
||||
const VectorAttribute * disk;
|
||||
string tm_mad;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string ds_id;
|
||||
int disk_id;
|
||||
|
||||
@@ -520,17 +522,6 @@ void TransferManager::prolog_migr_action(int vid)
|
||||
// -------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// -------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "prolog_migr, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::PROLOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -538,11 +529,19 @@ void TransferManager::prolog_migr_action(int vid)
|
||||
return;
|
||||
}
|
||||
|
||||
if (!vm->hasHistory())
|
||||
if (!vm->hasHistory() || !vm->hasPreviousHistory())
|
||||
{
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
vm_tm_mad = vm->get_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".migrate";
|
||||
xfr.open(xfr_name.c_str(), ios::out | ios::trunc);
|
||||
|
||||
@@ -588,7 +587,7 @@ void TransferManager::prolog_migr_action(int vid)
|
||||
|
||||
//MV tm_mad prev_host:remote_system_dir host:remote_system_dir VMID 0
|
||||
xfr << "MV "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< vm->get_previous_hostname() << ":"
|
||||
<< vm->get_remote_system_dir() << " "
|
||||
<< vm->get_hostname() << ":"
|
||||
@@ -608,6 +607,11 @@ error_history:
|
||||
os << "prolog_migr, VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "prolog_migr, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os.str("");
|
||||
os << "prolog_migr, could not open file: " << xfr_name;
|
||||
@@ -632,7 +636,7 @@ void TransferManager::prolog_resume_action(int vid)
|
||||
|
||||
const VectorAttribute * disk;
|
||||
string tm_mad;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string ds_id;
|
||||
int disk_id;
|
||||
|
||||
@@ -647,17 +651,6 @@ void TransferManager::prolog_resume_action(int vid)
|
||||
// -------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// -------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "prolog_resume, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::PROLOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -670,6 +663,14 @@ void TransferManager::prolog_resume_action(int vid)
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
vm_tm_mad = vm->get_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".resume";
|
||||
xfr.open(xfr_name.c_str(), ios::out | ios::trunc);
|
||||
|
||||
@@ -714,7 +715,7 @@ void TransferManager::prolog_resume_action(int vid)
|
||||
|
||||
//MV tm_mad fe:system_dir host:remote_system_dir vmid 0
|
||||
xfr << "MV "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< nd.get_nebula_hostname() << ":"<< vm->get_system_dir() << " "
|
||||
<< vm->get_hostname() << ":" << vm->get_remote_system_dir()<< " "
|
||||
<< vm->get_oid() << " "
|
||||
@@ -732,6 +733,11 @@ error_history:
|
||||
os << "prolog_resume, VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "prolog_resume, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os.str("");
|
||||
os << "prolog_resume, could not open file: " << xfr_name;
|
||||
@@ -821,7 +827,7 @@ void TransferManager::epilog_action(int vid)
|
||||
ofstream xfr;
|
||||
ostringstream os;
|
||||
string xfr_name;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string error_str;
|
||||
|
||||
const VectorAttribute * disk;
|
||||
@@ -837,17 +843,6 @@ void TransferManager::epilog_action(int vid)
|
||||
// ------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// ------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "epilog, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::EPILOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -860,6 +855,14 @@ void TransferManager::epilog_action(int vid)
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
vm_tm_mad = vm->get_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".epilog";
|
||||
xfr.open(xfr_name.c_str(), ios::out | ios::trunc);
|
||||
|
||||
@@ -885,9 +888,9 @@ void TransferManager::epilog_action(int vid)
|
||||
epilog_transfer_command(vm, disk, xfr);
|
||||
}
|
||||
|
||||
//DELETE system_tm_mad hostname:remote_system_dir vmid ds_id
|
||||
//DELETE vm_tm_mad hostname:remote_system_dir vmid ds_id
|
||||
xfr << "DELETE "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< vm->get_hostname() << ":" << vm->get_remote_system_dir() << " "
|
||||
<< vm->get_oid() << " "
|
||||
<< "0" << endl;
|
||||
@@ -904,6 +907,11 @@ error_history:
|
||||
os << "epilog, VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "epilog, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os.str("");
|
||||
os << "epilog, could not open file: " << xfr_name;
|
||||
@@ -926,7 +934,7 @@ void TransferManager::epilog_stop_action(int vid)
|
||||
ostringstream os;
|
||||
string xfr_name;
|
||||
string tm_mad;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string ds_id;
|
||||
int disk_id;
|
||||
|
||||
@@ -942,17 +950,6 @@ void TransferManager::epilog_stop_action(int vid)
|
||||
// ------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// ------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "epilog_stop, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::EPILOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -965,6 +962,14 @@ void TransferManager::epilog_stop_action(int vid)
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
vm_tm_mad = vm->get_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".stop";
|
||||
xfr.open(xfr_name.c_str(), ios::out | ios::trunc);
|
||||
|
||||
@@ -1007,9 +1012,9 @@ void TransferManager::epilog_stop_action(int vid)
|
||||
<< ds_id << endl;
|
||||
}
|
||||
|
||||
//MV system_tm_mad hostname:remote_system_dir fe:system_dir
|
||||
//MV vm_tm_mad hostname:remote_system_dir fe:system_dir
|
||||
xfr << "MV "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< vm->get_hostname() << ":" << vm->get_remote_system_dir() << " "
|
||||
<< nd.get_nebula_hostname() << ":" << vm->get_system_dir() << " "
|
||||
<< vm->get_oid() << " "
|
||||
@@ -1028,6 +1033,11 @@ error_history:
|
||||
os << "epilog_stop, VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "epilog_stop, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os.str("");
|
||||
os << "epilog_stop, could not open file: " << xfr_name;
|
||||
@@ -1049,7 +1059,7 @@ void TransferManager::epilog_delete_action(bool local, int vid)
|
||||
ofstream xfr;
|
||||
ostringstream os;
|
||||
string xfr_name;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string tm_mad;
|
||||
string ds_id;
|
||||
int disk_id;
|
||||
@@ -1066,17 +1076,6 @@ void TransferManager::epilog_delete_action(bool local, int vid)
|
||||
// ------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// ------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "epilog_delete, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::EPILOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -1088,7 +1087,15 @@ void TransferManager::epilog_delete_action(bool local, int vid)
|
||||
{
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
|
||||
vm_tm_mad = vm->get_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".delete";
|
||||
xfr.open(xfr_name.c_str(), ios::out | ios::trunc);
|
||||
|
||||
@@ -1144,18 +1151,18 @@ void TransferManager::epilog_delete_action(bool local, int vid)
|
||||
|
||||
if ( local )
|
||||
{
|
||||
//DELETE system_tm_mad fe:system_dir vmid dsid(=0)
|
||||
//DELETE vm_tm_mad fe:system_dir vmid dsid(=0)
|
||||
xfr << "DELETE "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< nd.get_nebula_hostname() <<":"<< vm->get_system_dir() << " "
|
||||
<< vm->get_oid() << " "
|
||||
<< "0";
|
||||
}
|
||||
else
|
||||
{
|
||||
//DELETE system_tm_mad hostname:remote_system_dir vmid dsid(=0)
|
||||
//DELETE vm_tm_mad hostname:remote_system_dir vmid dsid(=0)
|
||||
xfr << "DELETE "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< vm->get_hostname() <<":"<< vm->get_remote_system_dir() << " "
|
||||
<< vm->get_oid() << " "
|
||||
<< "0";
|
||||
@@ -1173,6 +1180,11 @@ error_history:
|
||||
os << "epilog_delete, VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "epilog_delete, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os.str("");
|
||||
os << "epilog_delete, could not open file: " << xfr_name;
|
||||
@@ -1196,7 +1208,7 @@ void TransferManager::epilog_delete_previous_action(int vid)
|
||||
ofstream xfr;
|
||||
ostringstream os;
|
||||
string xfr_name;
|
||||
string system_tm_mad;
|
||||
string vm_tm_mad;
|
||||
string tm_mad;
|
||||
string ds_id;
|
||||
int disk_id;
|
||||
@@ -1213,17 +1225,6 @@ void TransferManager::epilog_delete_previous_action(int vid)
|
||||
// ------------------------------------------------------------------------
|
||||
// Setup & Transfer script
|
||||
// ------------------------------------------------------------------------
|
||||
system_tm_mad = nd.get_system_ds_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || system_tm_mad.empty() )
|
||||
{
|
||||
NebulaLog::log("TM", Log::ERROR, "epilog_delete, error getting drivers.");
|
||||
(nd.get_lcm())->trigger(LifeCycleManager::EPILOG_FAILURE,vid);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
vm = vmpool->get(vid,true);
|
||||
|
||||
if (vm == 0)
|
||||
@@ -1236,6 +1237,14 @@ void TransferManager::epilog_delete_previous_action(int vid)
|
||||
goto error_history;
|
||||
}
|
||||
|
||||
vm_tm_mad = vm->get_previous_tm_mad();
|
||||
tm_md = get();
|
||||
|
||||
if ( tm_md == 0 || vm_tm_mad.empty() )
|
||||
{
|
||||
goto error_drivers;
|
||||
}
|
||||
|
||||
xfr_name = vm->get_transfer_file() + ".delete_prev";
|
||||
xfr.open(xfr_name.c_str(),ios::out | ios::trunc);
|
||||
|
||||
@@ -1276,9 +1285,9 @@ void TransferManager::epilog_delete_previous_action(int vid)
|
||||
<< ds_id << endl;
|
||||
}
|
||||
|
||||
//DELTE system_tm_mad prev_host:remote_system_dir vmid ds_id(=0)
|
||||
//DELTE vm_tm_mad prev_host:remote_system_dir vmid ds_id(=0)
|
||||
xfr << "DELETE "
|
||||
<< system_tm_mad << " "
|
||||
<< vm_tm_mad << " "
|
||||
<< vm->get_previous_hostname() <<":"<< vm->get_remote_system_dir()
|
||||
<< " " << vm->get_oid() << " "
|
||||
<< "0" << endl;
|
||||
@@ -1295,9 +1304,14 @@ error_history:
|
||||
os << "epilog_delete_previous, VM " << vid << " has no history";
|
||||
goto error_common;
|
||||
|
||||
error_drivers:
|
||||
os.str("");
|
||||
os << "epilog_delete_previous, error getting drivers.";
|
||||
goto error_common;
|
||||
|
||||
error_file:
|
||||
os.str("");
|
||||
os << "epilog_delete, could not open file: " << xfr_name;
|
||||
os << "epilog_delete_previous, could not open file: " << xfr_name;
|
||||
os << ". You may need to manually clean " << vm->get_previous_hostname()
|
||||
<< ":" << vm->get_remote_system_dir();
|
||||
goto error_common;
|
||||
|
||||
Reference in new issue
Block a user