]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: we can get EAGAIN on missing clone flush
authorSamuel Just <sam.just@inktank.com>
Fri, 25 Apr 2014 23:28:38 +0000 (16:28 -0700)
committerSage Weil <sage@inktank.com>
Wed, 30 Apr 2014 22:06:00 +0000 (15:06 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 060105c313c5b4a777c55f17115eeb95ebb17117)

src/osd/ReplicatedPG.cc

index 9bcaa9e7524a4e5328447b634891c49a71e62104..de04481bfb1ca0b436875c7d38c64d91a3ea328b 100644 (file)
@@ -1317,7 +1317,7 @@ void ReplicatedPG::do_op(OpRequestRef op)
        (!(m->get_flags() & CEPH_OSD_FLAG_BALANCE_READS) &&
         !(m->get_flags() & CEPH_OSD_FLAG_LOCALIZE_READS))) {
       // missing the specific snap we need; requeue and wait.
-      assert(!can_create); // only happens on a read
+      assert(!op->may_write()); // only happens on a read/cache
       wait_for_unreadable_object(missing_oid, op);
       return;
     }