[Pkg-ceph-commits] [ceph] 01/01: New patch to show OSD affinity in "ceph osd tree".

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit ae3e56e (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Dec 25 04:51:38 2014

    New patch to show OSD affinity in "ceph osd tree".
    
     Thanks, Mykola Golub.
---
 debian/patches/bug-10036.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/bug-10036.patch b/debian/patches/bug-10036.patch
new file mode 100644
index 0000000..360e476
--- /dev/null
+++ b/debian/patches/bug-10036.patch
@@ -0,0 +1,32 @@
+Last-Update: 2014-12-25
+Bug-Ceph: http://tracker.ceph.com/issues/10036
+Author: Mykola Golub <mgolub at mirantis.com>
+Description: show primary-affinity in OSD tree
+
+--- a/src/osd/OSDMap.cc
++++ b/src/osd/OSDMap.cc
+@@ -2349,19 +2349,23 @@
+       *out << std::setprecision(4)
+ 	   << (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));
+     }
+   }
+ }
+ 
+ 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;
+   set<int> roots;
diff --git a/debian/patches/series b/debian/patches/series
index fc11475..a50b0d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 ## Backported / Upstream
 0latest-giant.patch
 bug-9814.patch
+bug-10036.patch
 bug-10059.patch
 sleep-recover.patch
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git