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

Feature #4238: When making an image non-persistent

Browse Source 
check if the datastore is PERSISTENT_ONLY
This commit is contained in:
Jaime Melis 2015-12-22 16:37:50 +01:00
parent d7b8aa1cd3
commit 77ba16bf56
1 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/rm/RequestManagerImage.cc
View File

@ -68,8 +68,15 @@ void ImagePersistent::request_execute(xmlrpc_c::paramList const& paramList,
bool persistent_flag = xmlrpc_c::value_boolean(paramList.getBoolean(2));
int rc;
int ds_id;
int ds_persistent_only;
Nebula& nd = Nebula::instance();
DatastorePool * dspool = nd.get_dspool();
Datastore * ds;
Image * image;
string err_msg;
std::string err_msg;
if ( basic_authorization(id, att) == false )
{
@ -87,6 +94,36 @@ void ImagePersistent::request_execute(xmlrpc_c::paramList const& paramList,
return;
}
ds_id = image->get_ds_id();
image->unlock();
ds = dspool->get(ds_id, true);
if ( ds == 0 )
{
failure_response(INTERNAL,
request_error("Datastore no longer exists.",
""), att);
return;
}
ds_persistent_only = ds->is_persistent_only();
ds->unlock();
image = static_cast<Image *>(pool->get(id,true));
if ( image == 0 )
{
failure_response(NO_EXISTS,
get_error(object_name(auth_object),id),
att);
return;
}
switch (image->get_type())
{
case Image::OS:
@ -104,6 +141,17 @@ void ImagePersistent::request_execute(xmlrpc_c::paramList const& paramList,
return;
}
/* Check if datastore allows the operation */
if ( ds_persistent_only && persistent_flag == false )
{
failure_response(INTERNAL,
request_error("This Datastore only accepts persistent images.",""),
att);
image->unlock();
return;
}
rc = image->persistent(persistent_flag, err_msg);
if ( rc != 0 )