RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 07:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

librados: take lock in rollback

Browse Source 
We're poking through the osdmap; need to hold the lock here.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-12-30 17:04:47 -08:00
parent 4c23e9e439
commit a125246305
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librados.cc
View File

@ -1228,6 +1228,7 @@ int librados::RadosClient::rollback(rados_ioctx_t io_, const object_t& oid,
IoCtxImpl* io = (IoCtxImpl *) io_;
string sName(snapName);
lock.Lock();
snapid_t snap;
const map<int64_t, pg_pool_t>& pools = objecter->osdmap->get_pools();
const pg_pool_t& pg_pool = pools.find(io->poolid)->second;
@ -1240,7 +1241,11 @@ int librados::RadosClient::rollback(rados_ioctx_t io_, const object_t& oid,
break;
}
}
if (p == pg_pool.snaps.end()) return -ENOENT;
if (p == pg_pool.snaps.end()) {
lock.Unlock();
return -ENOENT;
}
lock.Unlock();
return selfmanaged_snap_rollback_object(io_, oid, io->snapc, snap);
}