]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::process_copy_chunk: don't check snaps if we got head
authorSamuel Just <sam.just@inktank.com>
Tue, 8 Apr 2014 17:47:55 +0000 (10:47 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 14 Apr 2014 23:55:16 +0000 (16:55 -0700)
Even if we are promoting a clone, we may be reading from head.

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index d8e092fc571e6fff11339646025b0512c49e9f30..06034667bfb9e10672ca41fbf0c89d784ca1e378 100644 (file)
@@ -5533,7 +5533,7 @@ void ReplicatedPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r)
 
   assert(cop->rval >= 0);
 
-  if (oid.snap < CEPH_NOSNAP) {
+  if (oid.snap < CEPH_NOSNAP && !cop->results.snaps.empty()) {
     // verify snap hasn't been deleted
     vector<snapid_t>::iterator p = cop->results.snaps.begin();
     while (p != cop->results.snaps.end()) {