From: Kefu Chai <kchai@redhat.com>
Date: Fri, 31 Mar 2017 10:30:53 +0000 (+0800)
Subject: mgr: use OSDMap::get_pg_acting_primary() to get the primary
X-Git-Tag: v12.0.2~247^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73c75b97c5451f3d2f2414bb848f2473e25df22f;p=ceph.git

mgr: use OSDMap::get_pg_acting_primary() to get the primary

OSDMap::pg_to_acting_osds() assumes that the "acting" parameter is not
null.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 5237f93a5ed7..f4f301193ae6 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -498,7 +498,7 @@ bool DaemonServer::handle_command(MCommand *m)
     int acting_primary = -1;
     entity_inst_t inst;
     cluster_state.with_osdmap([&](const OSDMap& osdmap) {
-	osdmap.pg_to_acting_osds(pgid, nullptr, &acting_primary);
+	acting_primary = osdmap.get_pg_acting_primary(pgid);
 	if (acting_primary >= 0) {
 	  inst = osdmap.get_inst(acting_primary);
 	}