From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Fri, 28 Feb 2020 04:19:03 +0000 (+0800)
Subject: crimson/osd: fix conditions to update up_epoch
X-Git-Tag: v15.1.1~183^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2749953b840a81bdb17e7f3a7c1637f933eef0db;p=ceph.git

crimson/osd: fix conditions to update up_epoch

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 3d2c91bbe1d1..c65d909a1399 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -878,7 +878,7 @@ seastar::future<> OSD::committed_osd_maps(version_t first,
     return get_map(cur).then([this](cached_map_t&& o) {
       osdmap = std::move(o);
       shard_services.update_map(osdmap);
-      if (up_epoch != 0 &&
+      if (up_epoch == 0 &&
           osdmap->is_up(whoami) &&
           osdmap->get_addrs(whoami) == public_msgr->get_myaddrs()) {
         up_epoch = osdmap->get_epoch();