From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sat, 15 Jun 2019 00:34:09 +0000 (+0800)
Subject: Revert "mon/OSDMonitor: report pg[pgp]_num_target instead of pg[pgp]_num"
X-Git-Tag: v15.1.0~2395^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65b6adfc88932f39e2ba4b14e1f8e87dfd8f3c21;p=ceph.git

Revert "mon/OSDMonitor: report pg[pgp]_num_target instead of pg[pgp]_num"

This reverts commit a160dc416a7c19eccce66f36719468680cd151f4.
Since it does not mean to fix anything, I'd like to leave it
the way it is.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c66883867bd2..34c4c5ce8f3e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -5437,10 +5437,10 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
         ceph_assert(i != ALL_CHOICES.end());
 	switch(*it) {
 	  case PG_NUM:
-	    f->dump_int("pg_num", p->get_pg_num_target());
+	    f->dump_int("pg_num", p->get_pg_num());
 	    break;
 	  case PGP_NUM:
-	    f->dump_int("pgp_num", p->get_pgp_num_target());
+	    f->dump_int("pgp_num", p->get_pgp_num());
 	    break;
 	  case SIZE:
 	    f->dump_int("size", p->get_size());
@@ -5595,10 +5595,10 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
 	choices_map_t::const_iterator i;
 	switch(*it) {
 	  case PG_NUM:
-	    ss << "pg_num: " << p->get_pg_num_target() << "\n";
+	    ss << "pg_num: " << p->get_pg_num() << "\n";
 	    break;
 	  case PGP_NUM:
-	    ss << "pgp_num: " << p->get_pgp_num_target() << "\n";
+	    ss << "pgp_num: " << p->get_pgp_num() << "\n";
 	    break;
 	  case SIZE:
 	    ss << "size: " << p->get_size() << "\n";