From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Sep 2018 21:40:22 +0000 (-0500)
Subject: mgr/DaemonServer: remove stale/misleading check
X-Git-Tag: v14.1.0~1136^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3365c5d40b93f3886175d3e7c07e66db9f6dcead;p=ceph.git

mgr/DaemonServer: remove stale/misleading check

The PGMap::last_osdmap_epoch is always 0.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index b43077bca3166..899692b1ca8e7 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -2261,12 +2261,6 @@ void DaemonServer::adjust_pgs()
 	       << dendl;
 
       cluster_state.with_osdmap([&](const OSDMap& osdmap) {
-	  if (pg_map.last_osdmap_epoch != osdmap.get_epoch()) {
-	    // do nothing if maps aren't in sync
-	    dout(10) << "last_osdmap_epoch " << pg_map.last_osdmap_epoch
-		     << " osdmap " << osdmap.get_epoch() << dendl;
-	    //return;
-	  }
 	  for (auto& i : osdmap.get_pools()) {
 	    const pg_pool_t& p = i.second;