Merge pull request #3538 from athanatos/wip-7862

osd: allow recovery below min size

Reviewed-by: Sage Weil <sage@redhat.com>

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

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

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

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

diff --cc src/osd/osd_types.h
index c96c115a995a9bc62c467bdb04b036adc99870af,5cb7ed4efb6cc4b6599bd65c82a4812a0057f525..7c7504b2c9ae705edef039e624a6098e7b0a1114
--- 1/src/osd/osd_types.h
--- 2/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@@ -768,9 -768,10 +768,10 @@@ inline ostream& operator<<(ostream& out
  #define PG_STATE_RECOVERY_WAIT (1<<22) // waiting for recovery reservations
  #define PG_STATE_UNDERSIZED    (1<<23) // pg acting < pool size
  #define PG_STATE_ACTIVATING   (1<<24) // pg is peered but not yet active
+ #define PG_STATE_PEERED        (1<<25) // peered, cannot go active, can recover
  
  std::string pg_state_string(int state);
 -
 +std::string pg_vector_string(const vector<int32_t> &a);
  
  /*
   * pool_snap_info_t