From: Mykola Golub <mgolub@mirantis.com>
Date: Wed, 24 Dec 2014 08:22:59 +0000 (+0200)
Subject: osd: osd tree to show primary-affinity value
X-Git-Tag: v0.92~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70ef30f67e160758574d0b401424efbaa27f0735;p=ceph.git

osd: osd tree to show primary-affinity value

Fixes: #10036

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 864d5542f8a..5a9370802f4 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2477,9 +2477,13 @@ void OSDMap::print_osd_line(int cur, ostream *out, Formatter *f) const
 	   << (exists(cur) ? get_weightf(cur) : 0)
 	   << std::setprecision(p)
 	   << "\t";
+      *out << std::setprecision(4)
+	   << (exists(cur) ? get_primary_affinityf(cur) : 0)
+	   << std::setprecision(p);
     }
     if (f) {
       f->dump_float("reweight", get_weightf(cur));
+      f->dump_float("primary_affinity", get_primary_affinityf(cur));
     }
   }
 }
@@ -2487,7 +2491,7 @@ void OSDMap::print_osd_line(int cur, ostream *out, Formatter *f) const
 void OSDMap::print_tree(ostream *out, Formatter *f) const
 {
   if (out)
-    *out << "# id\tweight\ttype name\tup/down\treweight\n";
+    *out << "# id\tweight\ttype name\tup/down\treweight\tprimary-affinity\n";
   if (f)
     f->open_array_section("nodes");
   set<int> touched;