From a183fe7404b887f1786c2ac18fb07434d72c0743 Mon Sep 17 00:00:00 2001
From: Samuel Just <sam.just@inktank.com>
Date: Thu, 8 Nov 2012 17:07:21 -0800
Subject: [PATCH] OSDMap.cc: Add pool name to OSDMap dump

Otherwise, we can't use ceph osd dump --format=json to map pool name
onto pool id.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---
 src/osd/OSDMap.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index b76023386baa5..a1464d0ff0089 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1247,8 +1247,13 @@ void OSDMap::dump(Formatter *f) const
 
   f->open_array_section("pools");
   for (map<int64_t,pg_pool_t>::const_iterator p = pools.begin(); p != pools.end(); ++p) {
+    std::string name("<unknown>");
+    map<int64_t,string>::const_iterator pni = pool_name.find(p->first);
+    if (pni != pool_name.end())
+      name = pni->second;
     f->open_object_section("pool");
     f->dump_int("pool", p->first);
+    f->dump_string("pool_name", name);
     p->second.dump(f);
     f->close_section();
   }
-- 
2.39.5