From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Sep 2019 07:46:31 +0000 (+0800)
Subject: osd: do not check for CEPH_OSDMAP_FULL anymore
X-Git-Tag: v15.1.0~1333^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fb0e2c71133669a7873db19840fc9bba69a25816;p=ceph-ci.git

osd: do not check for CEPH_OSDMAP_FULL anymore

per-pool full flag has taken the place of it since
b4ca5ae462c6f12ca48b787529938862646282cd

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8f8618249b0..2ad6293d150 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -8963,11 +8963,6 @@ void OSD::activate_map()
 
   dout(7) << "activate_map version " << osdmap->get_epoch() << dendl;
 
-  if (osdmap->test_flag(CEPH_OSDMAP_FULL)) {
-    dout(10) << " osdmap flagged full, doing onetime osdmap subscribe" << dendl;
-    osdmap_subscribe(osdmap->get_epoch() + 1, false);
-  }
-
   // norecover?
   if (osdmap->test_flag(CEPH_OSDMAP_NORECOVER)) {
     if (!service.recovery_is_paused()) {
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 008fa52ba98..d62dd19e219 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -463,17 +463,11 @@ void PeeringState::complete_flush()
 
 void PeeringState::check_full_transition(OSDMapRef lastmap, OSDMapRef osdmap)
 {
-  bool changed = false;
-  if (osdmap->test_flag(CEPH_OSDMAP_FULL) &&
-      !lastmap->test_flag(CEPH_OSDMAP_FULL)) {
-    psdout(10) << " cluster was marked full in "
-	       << osdmap->get_epoch() << dendl;
-    changed = true;
-  }
   const pg_pool_t *pi = osdmap->get_pg_pool(info.pgid.pool());
   if (!pi) {
     return; // pool deleted
   }
+  bool changed = false;
   if (pi->has_flag(pg_pool_t::FLAG_FULL)) {
     const pg_pool_t *opi = lastmap->get_pg_pool(info.pgid.pool());
     if (!opi || !opi->has_flag(pg_pool_t::FLAG_FULL)) {
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 3c49fae9318..a9c16764189 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -8287,8 +8287,7 @@ int PrimaryLogPG::prepare_transaction(OpContext *ctx)
   // check for full
   if ((ctx->delta_stats.num_bytes > 0 ||
        ctx->delta_stats.num_objects > 0) &&  // FIXME: keys?
-      (pool.info.has_flag(pg_pool_t::FLAG_FULL) ||
-       get_osdmap()->test_flag(CEPH_OSDMAP_FULL))) {
+      pool.info.has_flag(pg_pool_t::FLAG_FULL)) {
     auto m = ctx->op->get_req<MOSDOp>();
     if (ctx->reqid.name.is_mds() ||   // FIXME: ignore MDS for now
 	m->has_flag(CEPH_OSD_FLAG_FULL_FORCE)) {