Merge branch 'luminous' into wip-22724

diff --cc src/mon/PGMap.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
index 4ea2d0b9ef3f67251b0f8e6d8678f7b56ca152d9,fb308abba552d2dfcf53373d7e8e6c64454c0767..8691a273a8a48913bd5d6eccfae95e933ae10470
--- 1/src/osd/PG.h
--- 2/src/osd/PG.h
+++ b/src/osd/PG.h
@@@ -1886,7 -1872,8 +1902,9 @@@ protected
        boost::statechart::custom_reaction< AllReplicasActivated >,
        boost::statechart::custom_reaction< DeferRecovery >,
        boost::statechart::custom_reaction< DeferBackfill >,
 -      boost::statechart::custom_reaction< UnfoundRecovery >,
 -      boost::statechart::custom_reaction< UnfoundBackfill >
++  boost::statechart::custom_reaction< UnfoundRecovery >,
++      boost::statechart::custom_reaction< UnfoundBackfill >,
 +      boost::statechart::custom_reaction< DoRecovery>
        > reactions;
        boost::statechart::result react(const QueryState& q);
        boost::statechart::result react(const ActMap&);
@@@ -1904,7 -1891,10 +1922,13 @@@
        boost::statechart::result react(const DeferBackfill& evt) {
        return discard_event();
        }
 -      return discard_event();
+       boost::statechart::result react(const UnfoundRecovery& evt) {
++  return discard_event();
+       }
+       boost::statechart::result react(const UnfoundBackfill& evt) {
++  return discard_event();
++      }
 +      boost::statechart::result react(const DoRecovery&) {
        return discard_event();
        }
      };

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

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