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>

diff --cc src/global/global_init.cc
Simple merge

diff --cc src/osd/ReplicatedPG.cc
index f6e28e4bc28c6ce3c9ee8a1def212f17de111e72,06674728192b24c4a26667e5671a6a3ef00c88d1..4b9e15b10ce84e127b7bdfa5ba99be9a2fc1a686
--- 1/src/osd/ReplicatedPG.cc
--- 2/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;

diff --cc src/osd/ReplicatedPG.h
Simple merge