Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd: change a few messages at level 0 and 1; change default level to 1/5 #13407

Merged
merged 2 commits into from Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/config_opts.h
Expand Up @@ -130,7 +130,7 @@ SUBSYS(rbd_replay, 0, 5)
SUBSYS(journaler, 0, 5)
SUBSYS(objectcacher, 0, 5)
SUBSYS(client, 0, 5)
SUBSYS(osd, 0, 5)
SUBSYS(osd, 1, 5)
SUBSYS(optracker, 0, 5)
SUBSYS(objclass, 0, 5)
SUBSYS(filestore, 1, 3)
Expand Down
16 changes: 8 additions & 8 deletions src/osd/OSD.cc
Expand Up @@ -4940,7 +4940,7 @@ void OSD::ms_handle_fast_accept(Connection *con)
bool OSD::ms_handle_reset(Connection *con)
{
Session *session = (Session *)con->get_priv();
dout(1) << "ms_handle_reset con " << con << " session " << session << dendl;
dout(2) << "ms_handle_reset con " << con << " session " << session << dendl;
if (!session)
return false;
session->wstate.reset(con);
Expand All @@ -4959,7 +4959,7 @@ bool OSD::ms_handle_refused(Connection *con)
return false;

Session *session = (Session *)con->get_priv();
dout(1) << "ms_handle_refused con " << con << " session " << session << dendl;
dout(2) << "ms_handle_refused con " << con << " session " << session << dendl;
if (!session)
return false;
int type = con->get_peer_type();
Expand Down Expand Up @@ -5005,7 +5005,7 @@ void OSD::start_boot()
heartbeat_kick();
return;
}
dout(1) << "We are healthy, booting" << dendl;
dout(1) << __func__ << dendl;
set_state(STATE_PREBOOT);
dout(10) << "start_boot - have maps " << superblock.oldest_map
<< ".." << superblock.newest_map << dendl;
Expand All @@ -5029,13 +5029,13 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)

// if our map within recent history, try to add ourselves to the osdmap.
if (osdmap->test_flag(CEPH_OSDMAP_NOUP)) {
dout(5) << "osdmap NOUP flag is set, waiting for it to clear" << dendl;
derr << "osdmap NOUP flag is set, waiting for it to clear" << dendl;
} else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) {
dout(1) << "osdmap SORTBITWISE OSDMap flag is NOT set; please set it"
<< dendl;
derr << "osdmap SORTBITWISE OSDMap flag is NOT set; please set it"
<< dendl;
} else if (!osdmap->test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) {
dout(1) << "osdmap REQUIRE_JEWEL OSDMap flag is NOT set; please set it"
<< dendl;
derr << "osdmap REQUIRE_JEWEL OSDMap flag is NOT set; please set it"
<< dendl;
} else if (!monc->monmap.get_required_features().contains_all(
ceph::features::mon::FEATURE_LUMINOUS)) {
derr << "monmap REQUIRE_LUMINOUS is NOT set; must upgrade all monitors to "
Expand Down