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.

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

Jump to bottom

hammer: osd: osd/PG.cc: 3837: FAILED assert(0 == "Running incompatible OSD") #7206

Merged
merged 2 commits into from Jan 31, 2016
Merged

hammer: osd: osd/PG.cc: 3837: FAILED assert(0 == "Running incompatible OSD") #7206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3066231
osd: CEPH_FEATURE_CHUNKY_SCRUB feature now required
dzafman Jun 5, 2015
53742bd
ceph_osd: Add required feature bits related to this branch to osd_req…
dzafman Jun 16, 2015
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
8 changes: 7 additions & 1 deletion src/ceph_osd.cc
View file
Open in desktop
Expand Up @@ -412,11 +412,17 @@ int main(int argc, const char **argv)
CEPH_FEATURE_MSG_AUTH |
CEPH_FEATURE_OSD_ERASURE_CODES;

// All feature bits 0 - 34 should be present from dumpling v0.67 forward
uint64_t osd_required =
CEPH_FEATURE_UID |
CEPH_FEATURE_PGID64 |
CEPH_FEATURE_OSDENC |
CEPH_FEATURE_OSD_SNAPMAPPER;
CEPH_FEATURE_OSD_SNAPMAPPER |
CEPH_FEATURE_INDEP_PG_MAP |
CEPH_FEATURE_OSD_PACKED_RECOVERY |
CEPH_FEATURE_RECOVERY_RESERVATION |
CEPH_FEATURE_BACKFILL_RESERVATION |
CEPH_FEATURE_CHUNKY_SCRUB;

ms_public->set_default_policy(Messenger::Policy::stateless_server(supported, 0));
ms_public->set_policy_throttlers(entity_name_t::TYPE_CLIENT,
Expand Down
18 changes: 0 additions & 18 deletions src/osd/PG.cc
View file
Open in desktop
Expand Up @@ -3818,26 +3818,8 @@ void PG::scrub(ThreadPool::TPHandle &handle)
return;
}

// when we're starting a scrub, we need to determine which type of scrub to do
if (!scrubber.active) {
OSDMapRef curmap = osd->get_osdmap();
assert(backfill_targets.empty());
for (unsigned i=0; i<acting.size(); i++) {
if (acting[i] == pg_whoami.osd)
continue;
if (acting[i] == CRUSH_ITEM_NONE)
continue;
ConnectionRef con = osd->get_con_osd_cluster(acting[i], get_osdmap()->get_epoch());
if (!con)
continue;
if (!con->has_feature(CEPH_FEATURE_CHUNKY_SCRUB)) {
dout(20) << "OSD " << acting[i]
<< " does not support chunky scrubs, falling back to classic"
<< dendl;
assert(0 == "Running incompatible OSD");
break;
}
}

scrubber.deep = state_test(PG_STATE_DEEP_SCRUB);

Expand Down