From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 28 Oct 2016 09:21:09 +0000 (+0800)
Subject: Merge pull request #9304 from dzafman/wip-13937
X-Git-Tag: v11.1.0~494
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7291ce22c990597b3ffffa222edfe49e3657d20;p=ceph.git

Merge pull request #9304 from dzafman/wip-13937

osd: handle EC recovery read errors

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

e7291ce22c990597b3ffffa222edfe49e3657d20
diff --cc src/osd/ReplicatedPG.cc
index f6e28e4bc28c,06674728192b..4b9e15b10ce8
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -8833,10 -8829,9 +8833,10 @@@ void ReplicatedPG::simple_opc_submit(Op
  void ReplicatedPG::submit_log_entries(
    const list<pg_log_entry_t> &entries,
    ObcLockManager &&manager,
 -  boost::optional<std::function<void(void)> > &&on_complete)
 +  boost::optional<std::function<void(void)> > &&on_complete,
 +  OpRequestRef op)
  {
-   dout(10) << __func__ << entries << dendl;
+   dout(10) << __func__ << " " << entries << dendl;
    assert(is_primary());
  
    ObjectStore::Transaction t;