From: Samuel Just <sam.just@inktank.com>
Date: Sun, 23 Feb 2014 08:48:27 +0000 (-0800)
Subject: ECBackend: skip canceled xattr reads as well
X-Git-Tag: v0.78~124^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8913ab4bb542233abb951f0faed3af2ff27c4f07;p=ceph.git

ECBackend: skip canceled xattr reads as well

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index e4572ab6ec0b..59d6b537a426 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -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);
   }