From: Samuel Just <sam.just@inktank.com>
Date: Mon, 2 Feb 2015 17:18:58 +0000 (-0800)
Subject: Merge pull request #3538 from athanatos/wip-7862
X-Git-Tag: v0.93~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1350b3041640fb13febab6130508e2abe6214a9a;p=ceph.git

Merge pull request #3538 from athanatos/wip-7862

osd: allow recovery below min size

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

1350b3041640fb13febab6130508e2abe6214a9a
diff --cc src/osd/osd_types.h
index c96c115a995a,5cb7ed4efb6c..7c7504b2c9ae
--- a/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