From: Igor Fedotov <ifedotov@suse.com>
Date: Tue, 13 Nov 2018 17:27:20 +0000 (+0300)
Subject: osd: dump legacy (calculated for now) params in osd_stat_t::dump.
X-Git-Tag: v14.1.0~692^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4ea6691479c539dbab48e51d75308da1b65e1bd;p=ceph.git

osd: dump legacy (calculated for now) params in osd_stat_t::dump.

This is to ensure backward compatibility with python modules that use
them.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 98540542eea0..2b5485368008 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -344,6 +344,16 @@ void osd_stat_t::dump(Formatter *f) const
   f->dump_unsigned("up_from", up_from);
   f->dump_unsigned("seq", seq);
   f->dump_unsigned("num_pgs", num_pgs);
+
+  /// dump legacy stats fields to ensure backward compatibility.
+  f->dump_unsigned("kb", statfs.kb());
+  f->dump_unsigned("kb_used", statfs.kb_used_raw());
+  f->dump_unsigned("kb_used_data", statfs.kb_used_data());
+  f->dump_unsigned("kb_used_omap", statfs.kb_used_omap());
+  f->dump_unsigned("kb_used_meta", statfs.kb_used_internal_metadata());
+  f->dump_unsigned("kb_avail", statfs.kb_avail());
+  ////////////////////
+
   f->open_object_section("statfs");
   statfs.dump(f);
   f->close_section();