From: Kefu Chai <kchai@redhat.com>
Date: Tue, 25 Jun 2019 16:15:53 +0000 (+0800)
Subject: crimson/osd: use get_osdmap_epoch()
X-Git-Tag: v15.1.0~2365^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b351ad55fda0082e96ec54348d29a2935d504999;p=ceph-ci.git

crimson/osd: use get_osdmap_epoch()

would be better to use the interfaces of the PG class, instead of
relying on its implementation.

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

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index d78f94403d9..ac276c23a71 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -111,7 +111,7 @@ bool PG::try_flush_or_schedule_async() {
   shard_services.get_store().do_transaction(
     coll_ref,
     ObjectStore::Transaction()).then(
-      [this, epoch=peering_state.get_osdmap()->get_epoch()]() {
+      [this, epoch=get_osdmap_epoch()]() {
 	return shard_services.start_operation<LocalPeeringEvent>(
 	  this,
 	  shard_services,
diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 4af2424963e..2e847a83c36 100644
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -114,7 +114,7 @@ public:
       int ret = prepare_info_keymap(
 	shard_services.get_cct(),
 	&km,
-	peering_state.get_osdmap()->get_epoch(),
+	get_osdmap_epoch(),
 	info,
 	last_written_info,
 	past_intervals,