diff options
| author | Samuel Just <sam.just@inktank.com> | 2014-04-23 01:03:48 +0200 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2014-04-23 23:11:17 +0200 |
| commit | 83f893489035add3c8504717d80ef48659e7145c (patch) | |
| tree | 19b971f16785fa7159e7dafe37e342df777c2b25 /src/osd/ReplicatedPG.cc | |
| parent | ReplicatedPG::do_op: don't return ENOENT for whiteout on snapdir read (diff) | |
| download | ceph-83f893489035add3c8504717d80ef48659e7145c.tar.xz ceph-83f893489035add3c8504717d80ef48659e7145c.zip | |
ReplicatedPG::do_osd_ops: consider head whiteout in list-snaps
Signed-off-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to '')
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2a4efdc7d3c..5d8419944f9 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -3537,7 +3537,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops) resp.clones.push_back(ci); } - if (ssc->snapset.head_exists) { + if (ssc->snapset.head_exists && + !ctx->obc->obs.oi.is_whiteout()) { assert(obs.exists); clone_info ci; ci.cloneid = CEPH_NOSNAP; |