]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ECBackend: skip canceled xattr reads as well
authorSamuel Just <sam.just@inktank.com>
Sun, 23 Feb 2014 08:48:27 +0000 (00:48 -0800)
committerSamuel Just <sam.just@inktank.com>
Sun, 23 Feb 2014 20:14:23 +0000 (12:14 -0800)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ECBackend.cc

index e4572ab6ec0b243c650680593bd405cdfdadfc33..59d6b537a426bf9910fcc2c52177a1b766a7a046 100644 (file)
@@ -942,7 +942,10 @@ void ECBackend::handle_sub_read_reply(
        i != op.attrs_read.end();
        ++i) {
     assert(!op.errors.count(i->first));
-    assert(rop.to_read.count(i->first));
+    if (!rop.to_read.count(i->first)) {
+      // We canceled this read! @see filter_read_op
+      continue;
+    }
     rop.complete[i->first].attrs = map<string, bufferlist>();
     (*(rop.complete[i->first].attrs)).swap(i->second);
   }