1. Removed name of the pool from pool_metadata

2. Included pool type in pool_metadata
3. Renamed rep_size attribute to size in pool_metadata

Signed-off-by: Babu Shanmugam <anbu@enovance.com>

diff --git a/README.md b/README.md
index f04f5b465d5f556d60ca1865d8807308d3cee4e6..7526480f1f81d3d12e1f4088eb8daf1f6d5c58a9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -53,19 +53,19 @@ Run 'ceph-brag -h' to get the usage information of this tool.
       },
       "pool_metadata": [
         {
-          "rep_size": 3,
+          "size": 3,
           "id": "0",
-          "name": "data"
+          "type": "replicated"
         },
         {
-          "rep_size": 3,
+          "size": 3,
           "id": "1",
-          "name": "metadata"
+          "name": "erasure"
         },
         {
-          "rep_size": 3,
+          "size": 3,
           "id": "2",
-          "name": "rbd"
+          "name": "replicated"
         }
       ],
       "sysinfo": [

diff --git a/client/ceph-brag b/client/ceph-brag
index f9e778f603a78149d3ff7c561f46329bea0dc244..e97b0c45cafd1c4e8d2bf36c0b8d903ef07913a7 100755 (executable)
--- a/client/ceph-brag
+++ b/client/ceph-brag
@@ -118,15 +118,12 @@ def get_pool_metadata():
   if rc is not 0:
     raise RuntimeError("\'ceph osd dump\' failed - " + e)
 
-  result = re.findall("pool\ (\d+)\ '(\S+)'\ rep\ size\ (\d+)", o)
+  result = re.findall("pool\ (\d+)\ '(\S+)'\ (\S+)\ size\ (\d+)", o)
   if len(result) is 0:
-    #Check with replicated size
-    result = re.findall("pool\ (\d+)\ '(\S+)'\ replicated\ size\ (\d+)", o)
-    if len(result) is 0:
-      raise RuntimeError("Unmatched pattern for \'pool\' in \'ceph osd dump\'")
+    raise RuntimeError("Unmatched pattern for \'pool\' in \'ceph osd dump\'")
 
   pool_meta = []
-  proc = lambda x: {'id':x[0], 'name':x[1], 'rep_size':int(x[2])}
+  proc = lambda x: {'id':x[0], 'type':x[2], 'size':int(x[3])}
   for r in result:
     pool_meta.append(proc(r))
 

diff --git a/server/ceph_brag/json.py b/server/ceph_brag/json.py
index 325a0f4e612628c96d5e7d59fb0125c8f4c4c70c..a97e580466861a32e20753a2160d97514e5e117e 100644 (file)
--- a/server/ceph_brag/json.py
+++ b/server/ceph_brag/json.py
@@ -33,8 +33,8 @@ def jsonify_components_info(comps):
 
 @jsonify.register(db.pools_info)
 def jsonify_pools_info(pool):
-    return dict(rep_size=pool.pool_rep_size,
-                name=pool.pool_name,
+    return dict(size=pool.pool_rep_size,
+                type=pool.pool_type,
                 id=pool.pool_id
                )
 

diff --git a/server/ceph_brag/model/db.py b/server/ceph_brag/model/db.py
index 6a2a828d40ecc903edf739d7472f2a396248a757..0a22d15074750691e66a6474be99ef8a69b1566e 100644 (file)
--- a/server/ceph_brag/model/db.py
+++ b/server/ceph_brag/model/db.py
@@ -51,7 +51,7 @@ class pools_info(Base):
   index = Column(Integer, primary_key=True)
   vid = Column(ForeignKey('version_info.index'))
   pool_id = Column(String(8))
-  pool_name = Column(String(16))
+  pool_type = Column(String(16))
   pool_rep_size = Column(Integer)
 
 class osds_info(Base):
@@ -169,8 +169,8 @@ def put_new_version(data):
     for p in pools:
       Session.add(pools_info(vid=vi.index,
                              pool_id=p['id'],
-                             pool_name=p['name'],
-                             pool_rep_size=p['rep_size']))
+                             pool_type=p['type'],
+                             pool_rep_size=p['size']))
 
   def add_osds_info(vi):
     osds = info['sysinfo']