admin/one
1
0 Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2026-11-14 16:53:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix unlock operations for admin users. Fix bug with recursive template

Browse Source 
clones, imges persistent attribute is set in clone operation
This commit is contained in:
Ruben S. Montero committed 2018-05-24 11:43:27 +02:00
1 parent e8b8e2021e
commit 7bbc01f60f
8 files changed
+56 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pool/PoolObjectSQL.cc
+16 -10
View File
@@ -592,10 +592,10 @@ bool PoolObjectSQL::name_is_valid(const string& obj_name,
int PoolObjectSQL::lock_db(const int owner, const int req_id, const int level)
{
locked = static_cast<LockStates>(level);
lock_time = time(0);
lock_owner = owner;
lock_req_id = req_id;
locked = static_cast<LockStates>(level);
lock_time = time(0);
lock_owner = owner;
lock_req_id = req_id;
return 0;
}
@@ -603,15 +603,21 @@ int PoolObjectSQL::lock_db(const int owner, const int req_id, const int level)
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
void PoolObjectSQL::unlock_db(const int owner, const int req_id)
int PoolObjectSQL::unlock_db(const int owner, const int req_id)
{
if ( owner == lock_owner )
int rc = -1;
if ( owner == -1 || owner == lock_owner )
{
locked = LockStates::ST_NONE;
lock_time = time(0);
lock_owner = -1;
lock_req_id = -1;
locked = LockStates::ST_NONE;
lock_time = time(0);
lock_owner = -1;
lock_req_id = -1;
rc = 0;
}
return rc;
}
/* -------------------------------------------------------------------------- */