diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-10-07 17:05:01 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-10-07 17:05:01 -0700 |
| commit | 86b5b427188bc683362b383e96eb833b169d15ed (patch) | |
| tree | 793475bcffb9ac1dc8059bd4a83e58cc62a28a2c | |
| parent | b9cc91dcef64eb88802e2a877fa73609fcf3607a (diff) | |
| parent | e21e5736b31d1df69238d1add9f35aadad058c57 (diff) | |
| download | ceph-86b5b427188bc683362b383e96eb833b169d15ed.tar.gz | |
Merge pull request #699 from dachary/wip-ghobject-assert
os: stronger assert on FileStore::lfn_open
Reviewed-by: David Zafman <david.zafman@inktank.com>
| -rw-r--r-- | src/os/FileStore.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index 3506c4a4ccd..20afde9a0dc 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -201,7 +201,9 @@ int FileStore::lfn_open(coll_t cid, IndexedPath *path, Index *index) { - assert(get_allow_sharded_objects() || oid.shard_id == ghobject_t::NO_SHARD); + assert(get_allow_sharded_objects() || + ( oid.shard_id == ghobject_t::NO_SHARD && + oid.generation == ghobject_t::NO_GEN )); assert(outfd); int flags = O_RDWR; if (create) |