Skip to content

mon/OSDMonitor: encode full osdmaps with features all OSDs can understand #11284

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.

Sign up for GitHub

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

Merged
liewegas merged 3 commits into from
Oct 16, 2016
Merged

mon/OSDMonitor: encode full osdmaps with features all OSDs can understand #11284

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e0daf6
mon/OSDMonitor: encode canonical full osdmap based on osdmap flags
liewegas Sep 30, 2016
12e5083
mon/OSDMonitor: health warn if require_{jewel,kraken} flags aren't set
liewegas Oct 13, 2016
6244755
mon/OSDMonitor: set REQUIRE_JEWEL when setting REQUIRE_KRAKEN
liewegas Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions src/mon/OSDMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,8 +1225,21 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
{
tmp.deepish_copy_from(osdmap);
tmp.apply_incremental(pending_inc);

// determine appropriate features
uint64_t features = mon->quorum_features;
if (!tmp.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) {
dout(10) << __func__ << " encoding without feature SERVER_JEWEL" << dendl;
features &= ~CEPH_FEATURE_SERVER_JEWEL;
}
if (!tmp.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
dout(10) << __func__ << " encoding without feature SERVER_KRAKEN" << dendl;
features &= ~CEPH_FEATURE_SERVER_KRAKEN;
}
dout(10) << __func__ << " encoding full map with " << features << dendl;

bufferlist fullbl;
::encode(tmp, fullbl, mon->quorum_features | CEPH_FEATURE_RESERVED);
::encode(tmp, fullbl, features | CEPH_FEATURE_RESERVED);
pending_inc.full_crc = tmp.get_crc();

// include full map in the txn. note that old monitors will
Expand Down Expand Up @@ -3062,6 +3075,25 @@ void OSDMonitor::get_health(list<pair<health_status_t,string> >& summary,
}
}

// warn about upgrade flags that can be set but are not.
if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_KRAKEN) &&
!osdmap.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
string msg = "all OSDs are running kraken or later but the"
" 'require_kraken_osds' osdmap flag is not set";
summary.push_back(make_pair(HEALTH_WARN, msg));
if (detail) {
detail->push_back(make_pair(HEALTH_WARN, msg));
}
} else if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_JEWEL) &&
!osdmap.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) {
string msg = "all OSDs are running jewel or later but the"
" 'require_jewel_osds' osdmap flag is not set";
summary.push_back(make_pair(HEALTH_WARN, msg));
if (detail) {
detail->push_back(make_pair(HEALTH_WARN, msg));
}
}

get_pools_health(summary, detail);
}
}
Expand Down Expand Up @@ -6386,7 +6418,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
}
} else if (key == "require_kraken_osds") {
if (osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_KRAKEN) {
return prepare_set_flag(op, CEPH_OSDMAP_REQUIRE_KRAKEN);
bool r = prepare_set_flag(op, CEPH_OSDMAP_REQUIRE_KRAKEN);
// ensure JEWEL is also set
pending_inc.new_flags |= CEPH_OSDMAP_REQUIRE_JEWEL;
return r;
} else {
ss << "not all up OSDs have CEPH_FEATURE_SERVER_KRAKEN feature";
err = -EPERM;
Expand Down