Ceph

[cephuser@mgmt example]$ ceph -v
ceph version 0.80.8 (69eaad7f8308f21573c604f121956e64679a52a7)

We'll want to backport this to firefly!

{ "rule_id": 27,
"rule_name": "foo",
"ruleset": 27,
"type": 3,
"min_size": 3,
"max_size": 20,
"steps": [ { "op": "set_chooseleaf_tries",
"num": 5}, { "op": "take",
"item": -1,
"item_name": "default"}, { "op": "chooseleaf_indep",
"num": 0,
"type": "host"}, { "op": "emit"}]}]

$ commit=e1d5773 ; picked_from=$(git show --no-patch --pretty=%b $commit  |  perl -ne 'print if(s/.*cherry picked from commit (\w+).*/$1/)') ; diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit)
--- /dev/fd/63    2015-05-13 21:29:20.559375020 +0200
+++ /dev/fd/62    2015-05-13 21:29:20.559375020 +0200
@@ -13,23 +21,12 @@
      }

      // degraded?
--    if (get_osdmap()->get_pg_size(info.pgid.pgid) > acting.size()) {
-+    if (get_osdmap()->get_pg_size(info.pgid.pgid) > actingset.size()) {
+-    if (get_osdmap()->get_pg_size(info.pgid.pgid) > acting.size())
++    if (get_osdmap()->get_pg_size(info.pgid.pgid) > actingset.size())
        state_set(PG_STATE_DEGRADED);
-       state_set(PG_STATE_UNDERSIZED);
-     }
-@@ -1915,8 +1915,8 @@ unsigned PG::get_backfill_priority()

-   // undersized: 200 + num missing replicas
-   if (is_undersized()) {
--    assert(pool.info.size > acting.size());
--    return 200 + (pool.info.size - acting.size());
-+    assert(pool.info.size > actingset.size());
-+    return 200 + (pool.info.size - actingset.size());
    }
- 
-   // degraded: baseline degraded
-@@ -6266,13 +6266,11 @@ boost::statechart::result PG::RecoveryState::Active::react(const AdvMap& advmap)
+@@ -6404,13 +6404,11 @@ boost::statechart::result PG::RecoveryState::Active::react(const AdvMap& advmap)
      pg->dirty_big_info = true;
    }

@@ -52,8 +49,8 @@
     * this does not matter) */
    if (advmap.lastmap->get_pg_size(pg->info.pgid.pgid) !=
        pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid)) {
--    if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <= pg->acting.size()) {
-+    if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <= pg->actingset.size()) {
-       pg->state_clear(PG_STATE_UNDERSIZED);
-       if (pg->needs_recovery()) {
-     pg->state_set(PG_STATE_DEGRADED);
+-    if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <= pg->acting.size())
++    if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <= pg->actingset.size())
+       pg->state_clear(PG_STATE_DEGRADED);
+     else
+       pg->state_set(PG_STATE_DEGRADED);