From: myoungwon oh <omwmw@sk.com>
Date: Tue, 10 Oct 2017 14:16:26 +0000 (+0900)
Subject: osd: use get_pgid() instead of info.pgid
X-Git-Tag: v13.0.1~573^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9416d524f1d3cb54514ffd4059a7d0e6e8f9f16;p=ceph-ci.git

osd: use get_pgid() instead of info.pgid

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 81f71d41be0..edf05b4d2e3 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1715,7 +1715,7 @@ void OSDService::queue_for_snap_trim(PG *pg)
   enqueue_back(
     OpQueueItem(
       unique_ptr<OpQueueItem::OpQueueable>(
-	new PGSnapTrim(pg->pg_id, pg->get_osdmap()->get_epoch())),
+	new PGSnapTrim(pg->get_pgid(), pg->get_osdmap()->get_epoch())),
       cct->_conf->osd_snap_trim_cost,
       cct->_conf->osd_snap_trim_priority,
       ceph_clock_now(),
@@ -1752,7 +1752,7 @@ void OSDService::queue_for_scrub(PG *pg, bool with_high_priority)
   const auto epoch = pg->get_osdmap()->get_epoch();
   enqueue_back(
     OpQueueItem(
-      unique_ptr<OpQueueItem::OpQueueable>(new PGScrub(pg->info.pgid, epoch)),
+      unique_ptr<OpQueueItem::OpQueueable>(new PGScrub(pg->get_pgid(), epoch)),
       cct->_conf->osd_snap_trim_cost,
       scrub_queue_priority,
       ceph_clock_now(),
@@ -1797,7 +1797,7 @@ void OSDService::_queue_for_recovery(
     OpQueueItem(
       unique_ptr<OpQueueItem::OpQueueable>(
 	new PGRecovery(
-	  p.second->info.pgid, p.first, reserved_pushes)),
+	  p.second->get_pgid(), p.first, reserved_pushes)),
       cct->_conf->osd_recovery_cost,
       cct->_conf->osd_recovery_priority,
       ceph_clock_now(),
@@ -9745,7 +9745,7 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb)
     return;
   }
   if (pg && !slot.pg && !pg->is_deleting()) {
-    dout(20) << __func__ << " " << item.first << " set pg to " << pg << dendl;
+    dout(20) << __func__ << " " << token << " set pg to " << pg << dendl;
     slot.pg = pg;
   }
   dout(30) << __func__ << " " << token