ceph: allow osd pool get to get everything you can set

osd pool get was missing size, min_size, crash_replay_interval,
and crush_ruleset; they're all easily added.

Fixes: #3869
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sam Lang <sam.lang@inktank.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9845552fc00c409717438da86e178df2aefbbbf2..23d68d1ce9abd6f0acb19ffc9b1f15e959292260 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2923,12 +2923,32 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 
        const pg_pool_t *p = osdmap.get_pg_pool(pool);
        if (m->cmd[4] == "pg_num") {
-         ss << "PG_NUM: " << p->get_pg_num();
+         ss << "pg_num: " << p->get_pg_num();
          err = 0;
          goto out;
        }
        if (m->cmd[4] == "pgp_num") {
-         ss << "PGP_NUM: " << p->get_pgp_num();
+         ss << "pgp_num: " << p->get_pgp_num();
+         err = 0;
+         goto out;
+       }
+       if (m->cmd[4] == "size") {
+          ss << "size: " << p->get_size();
+         err = 0;
+         goto out;
+       }
+       if (m->cmd[4] == "min_size") {
+         ss << "min_size: " << p->get_min_size();
+         err = 0;
+         goto out;
+       }
+       if (m->cmd[4] == "crash_replay_interval") {
+         ss << "crash_replay_interval: " << p->get_crash_replay_interval();
+         err = 0;
+         goto out;
+       }
+       if (m->cmd[4] == "crush_ruleset") {
+         ss << "crush_ruleset: " << p->get_crush_ruleset();
          err = 0;
          goto out;
        }

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 89c40b246c43a490ffe2ec6d706d6ae210558326..95859404c19d2b460fd1cdd86ffc7b1007b17b02 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -674,6 +674,7 @@ public:
   uint64_t get_flags() const { return flags; }
   unsigned get_type() const { return type; }
   unsigned get_size() const { return size; }
+  unsigned get_min_size() const { return min_size; }
   int get_crush_ruleset() const { return crush_ruleset; }
   int get_object_hash() const { return object_hash; }
   const char *get_object_hash_name() const {