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: rados cppool omap to ec pool crashes osd #8845

Merged
merged 2 commits into from Jul 25, 2016
Merged

hammer: osd: rados cppool omap to ec pool crashes osd #8845

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f024259
osd/ReplicatedPG: For obj has omap, it mean have omap data or omap he…
majianpeng Mar 23, 2015
fb1b40f
osd/Replicated: For CEPH_OSD_OP_WRITE, set data digest.
majianpeng Mar 22, 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
9 changes: 6 additions & 3 deletions src/osd/ReplicatedPG.cc
View file
Open in desktop
Expand Up @@ -4221,8 +4221,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
write_update_size_and_usage(ctx->delta_stats, oi, ctx->modified_ranges,
op.extent.offset, op.extent.length, true);
maybe_create_new_object(ctx);
if (op.extent.offset == 0 && op.extent.length == oi.size)
if (op.extent.offset == 0 && op.extent.length >= oi.size)
obs.oi.set_data_digest(osd_op.indata.crc32c(-1));
else if (op.extent.offset == oi.size && obs.oi.is_data_digest())
obs.oi.set_data_digest(osd_op.indata.crc32c(obs.oi.data_digest));
else
obs.oi.clear_data_digest();
}
Expand Down Expand Up @@ -6284,10 +6286,11 @@ void ReplicatedPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r)
return;
}

if (cop->omap_data.length())
if (cop->omap_data.length() || cop->omap_header.length())
cop->results.has_omap = true;

if (r >= 0 && pool.info.require_rollback() && cop->omap_data.length()) {
if (r >= 0 && pool.info.require_rollback() &&
(cop->omap_data.length() || cop->omap_header.length())) {
r = -EOPNOTSUPP;
}
cop->objecter_tid = 0;
Expand Down