RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: partial revert of "ReplicatedPG: result code not correctly set in some cases."

Browse Source 
This reverts the parts of commit 3b5d54bec0
that change omap return values (i.e., do not just assert, but
change what the client sees).

Fixes: #13796
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-11-17 15:40:28 -05:00
parent 46249fe5b2
commit 04e3810c89
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osd/ReplicatedPG.cc
View File

@ -5277,7 +5277,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
newop.op.op = CEPH_OSD_OP_SYNC_READ;
newop.op.extent.offset = 0;
newop.op.extent.length = 0;
result = do_osd_ops(ctx, nops);
do_osd_ops(ctx, nops);
osd_op.outdata.claim(newop.outdata);
}
break;
@ -5444,9 +5444,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
}
++ctx->num_read;
{
result = osd->store->omap_get_header(coll, ghobject_t(soid), &osd_op.outdata);
if (result < 0)
break;
osd->store->omap_get_header(coll, ghobject_t(soid), &osd_op.outdata);
ctx->delta_stats.num_rd_kb += SHIFT_ROUND_UP(osd_op.outdata.length(), 10);
ctx->delta_stats.num_rd++;
}
@ -5467,9 +5465,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
tracepoint(osd, do_osd_op_pre_omapgetvalsbykeys, soid.oid.name.c_str(), soid.snap.val, list_entries(keys_to_get).c_str());
map<string, bufferlist> out;
if (pool.info.supports_omap()) {
result = osd->store->omap_get_values(coll, ghobject_t(soid), keys_to_get, &out);
if (result < 0)
break;
osd->store->omap_get_values(coll, ghobject_t(soid), keys_to_get, &out);
} // else return empty omap entries
::encode(out, osd_op.outdata);
ctx->delta_stats.num_rd_kb += SHIFT_ROUND_UP(osd_op.outdata.length(), 10);
@ -5504,10 +5500,12 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
i != assertions.end();
++i)
to_get.insert(i->first);
result = osd->store->omap_get_values(coll, ghobject_t(soid),
int r = osd->store->omap_get_values(coll, ghobject_t(soid),
to_get, &out);
if (result < 0)
if (r < 0) {
result = r;
break;
}
} // else leave out empty
//Should set num_rd_kb based on encode length of map