From: Sage Weil Date: Fri, 11 Mar 2016 16:30:09 +0000 (-0500) Subject: osd: handle_osd_map whitespace X-Git-Tag: v10.1.0~55^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7fcab11e874530d724b5fbf7ed523b40b3328c6;p=ceph.git osd: handle_osd_map whitespace Signed-off-by: Sage Weil --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 69f47def18e7..1421dfafbbea 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6529,7 +6529,8 @@ void OSD::handle_osd_map(MOSDMap *m) assert(osd_lock.is_locked()); list pinned_maps; if (m->fsid != monc->get_fsid()) { - dout(0) << "handle_osd_map fsid " << m->fsid << " != " << monc->get_fsid() << dendl; + dout(0) << "handle_osd_map fsid " << m->fsid << " != " + << monc->get_fsid() << dendl; m->put(); return; } @@ -6540,7 +6541,8 @@ void OSD::handle_osd_map(MOSDMap *m) } Session *session = static_cast(m->get_connection()->get_priv()); - if (session && !(session->entity_name.is_mon() || session->entity_name.is_osd())) { + if (session && !(session->entity_name.is_mon() || + session->entity_name.is_osd())) { //not enough perms! dout(10) << "got osd map from Session " << session << " which we can't take maps from (not a mon or osd)" << dendl; @@ -6566,7 +6568,8 @@ void OSD::handle_osd_map(MOSDMap *m) if (first <= osdmap->get_epoch()) logger->inc(l_osd_mape_dup, osdmap->get_epoch() - first + 1); - // make sure there is something new, here, before we bother flushing the queues and such + // make sure there is something new, here, before we bother flushing + // the queues and such if (last <= osdmap->get_epoch()) { dout(10) << " no new maps here, dropping" << dendl; m->put(); @@ -6696,8 +6699,9 @@ void OSD::handle_osd_map(MOSDMap *m) t.remove(coll_t::meta(), get_inc_osdmap_pobject_name(e)); superblock.oldest_map = e+1; num++; + // make sure we at least keep pace with incoming maps if (num >= cct->_conf->osd_target_transaction_size && - (uint64_t)num > (last - first)) // make sure we at least keep pace with incoming maps + (uint64_t)num > (last - first)) break; } } @@ -6714,7 +6718,8 @@ void OSD::handle_osd_map(MOSDMap *m) // advance through the new maps for (epoch_t cur = start; cur <= superblock.newest_map; cur++) { - dout(10) << " advance to epoch " << cur << " (<= newest " << superblock.newest_map << ")" << dendl; + dout(10) << " advance to epoch " << cur + << " (<= newest " << superblock.newest_map << ")" << dendl; OSDMapRef newmap = get_map(cur); assert(newmap); // we just cached it above! @@ -6793,38 +6798,52 @@ void OSD::handle_osd_map(MOSDMap *m) is_active()) { if (!osdmap->exists(whoami)) { dout(0) << "map says i do not exist. shutting down." << dendl; - do_shutdown = true; // don't call shutdown() while we have everything paused + do_shutdown = true; // don't call shutdown() while we have + // everything paused } else if (!osdmap->is_up(whoami) || - !osdmap->get_addr(whoami).probably_equals(client_messenger->get_myaddr()) || - !osdmap->get_cluster_addr(whoami).probably_equals(cluster_messenger->get_myaddr()) || - !osdmap->get_hb_back_addr(whoami).probably_equals(hb_back_server_messenger->get_myaddr()) || + !osdmap->get_addr(whoami).probably_equals( + client_messenger->get_myaddr()) || + !osdmap->get_cluster_addr(whoami).probably_equals( + cluster_messenger->get_myaddr()) || + !osdmap->get_hb_back_addr(whoami).probably_equals( + hb_back_server_messenger->get_myaddr()) || (osdmap->get_hb_front_addr(whoami) != entity_addr_t() && - !osdmap->get_hb_front_addr(whoami).probably_equals(hb_front_server_messenger->get_myaddr()))) { + !osdmap->get_hb_front_addr(whoami).probably_equals( + hb_front_server_messenger->get_myaddr()))) { if (!osdmap->is_up(whoami)) { if (service.is_preparing_to_stop() || service.is_stopping()) { service.got_stop_ack(); } else { clog->warn() << "map e" << osdmap->get_epoch() - << " wrongly marked me down"; + << " wrongly marked me down"; } - } - else if (!osdmap->get_addr(whoami).probably_equals(client_messenger->get_myaddr())) + } else if (!osdmap->get_addr(whoami).probably_equals( + client_messenger->get_myaddr())) { clog->error() << "map e" << osdmap->get_epoch() - << " had wrong client addr (" << osdmap->get_addr(whoami) - << " != my " << client_messenger->get_myaddr() << ")"; - else if (!osdmap->get_cluster_addr(whoami).probably_equals(cluster_messenger->get_myaddr())) + << " had wrong client addr (" << osdmap->get_addr(whoami) + << " != my " << client_messenger->get_myaddr() << ")"; + } else if (!osdmap->get_cluster_addr(whoami).probably_equals( + cluster_messenger->get_myaddr())) { clog->error() << "map e" << osdmap->get_epoch() - << " had wrong cluster addr (" << osdmap->get_cluster_addr(whoami) - << " != my " << cluster_messenger->get_myaddr() << ")"; - else if (!osdmap->get_hb_back_addr(whoami).probably_equals(hb_back_server_messenger->get_myaddr())) + << " had wrong cluster addr (" + << osdmap->get_cluster_addr(whoami) + << " != my " << cluster_messenger->get_myaddr() << ")"; + } else if (!osdmap->get_hb_back_addr(whoami).probably_equals( + hb_back_server_messenger->get_myaddr())) { clog->error() << "map e" << osdmap->get_epoch() - << " had wrong hb back addr (" << osdmap->get_hb_back_addr(whoami) - << " != my " << hb_back_server_messenger->get_myaddr() << ")"; - else if (osdmap->get_hb_front_addr(whoami) != entity_addr_t() && - !osdmap->get_hb_front_addr(whoami).probably_equals(hb_front_server_messenger->get_myaddr())) + << " had wrong hb back addr (" + << osdmap->get_hb_back_addr(whoami) + << " != my " << hb_back_server_messenger->get_myaddr() + << ")"; + } else if (osdmap->get_hb_front_addr(whoami) != entity_addr_t() && + !osdmap->get_hb_front_addr(whoami).probably_equals( + hb_front_server_messenger->get_myaddr())) { clog->error() << "map e" << osdmap->get_epoch() - << " had wrong hb front addr (" << osdmap->get_hb_front_addr(whoami) - << " != my " << hb_front_server_messenger->get_myaddr() << ")"; + << " had wrong hb front addr (" + << osdmap->get_hb_front_addr(whoami) + << " != my " << hb_front_server_messenger->get_myaddr() + << ")"; + } if (!service.is_stopping()) { epoch_t up_epoch = 0; @@ -6837,7 +6856,8 @@ void OSD::handle_osd_map(MOSDMap *m) utime_t grace = utime_t(g_conf->osd_max_markdown_period, 0); osd_markdown_log.push_back(now); //clear all out-of-date log - while (!osd_markdown_log.empty() && osd_markdown_log.front() + grace < now) + while (!osd_markdown_log.empty() && + osd_markdown_log.front() + grace < now) osd_markdown_log.pop_front(); if ((int)osd_markdown_log.size() > g_conf->osd_max_markdown_count) { do_restart = false; @@ -6911,15 +6931,18 @@ void OSD::handle_osd_map(MOSDMap *m) } if (m->newest_map && m->newest_map > last) { - dout(10) << " msg say newest map is " << m->newest_map << ", requesting more" << dendl; + dout(10) << " msg say newest map is " << m->newest_map + << ", requesting more" << dendl; osdmap_subscribe(osdmap->get_epoch()+1, false); } else if (do_shutdown) { if (network_error) { Mutex::Locker l(heartbeat_lock); - map>::iterator it = failure_pending.begin(); + map>::iterator it = + failure_pending.begin(); while (it != failure_pending.end()) { - dout(10) << "handle_osd_ping canceling in-flight failure report for osd." << it->first << dendl; + dout(10) << "handle_osd_ping canceling in-flight failure report for osd." + << it->first << dendl; send_still_alive(osdmap->get_epoch(), it->second.second); failure_pending.erase(it++); }