]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: e shouldn't be zero in Objecter::handle_osd_map
authorDing Dinghua <dingdinghua85@gmail.com>
Thu, 30 Oct 2014 06:58:05 +0000 (14:58 +0800)
committerLoic Dachary <ldachary@redhat.com>
Wed, 11 Mar 2015 09:30:42 +0000 (10:30 +0100)
Signed-off-by: Ding Dinghua <dingdinghua85@gmail.com>
(cherry picked from commit 31c584c8ba022cd44fe2872d221f3026618cefab)

Conflicts:
src/osdc/Objecter.cc
        the debug line that follows was re-indented

src/osdc/Objecter.cc

index 57954a59b25280e8173a259d591bc3f9b807fe47..3c60c6c41fefd668175b67e62294cc9e34b03099 100644 (file)
@@ -607,7 +607,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
          logger->inc(l_osdc_map_full);
        }
        else {
-         if (e && e > m->get_oldest()) {
+         if (e > m->get_oldest()) {
            ldout(cct, 3) << "handle_osd_map requesting missing epoch " << osdmap->get_epoch()+1 << dendl;
            maybe_request_map();
            break;