RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: allow image resize to non-block boundaries

Browse Source 
The caller is still invalidating the entire cache, so we don't need to
deal with discard at this level.  That might be worth cleaning up
later, though.

Fixes: #2296
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2012-04-19 16:18:55 -07:00
parent 165038d589
commit 4ddbbf5467
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/librbd.cc
View File

@ -570,11 +570,23 @@ void trim_image(IoCtx& io_ctx, const rbd_obj_header_ondisk &header, uint64_t new
uint64_t bsize = get_block_size(header);
uint64_t numseg = get_max_block(header);
uint64_t start = get_block_num(header, newsize);
ldout(cct, 2) << "trimming image data from " << numseg << " to " << start << " objects..." << dendl;
for (uint64_t i=start; i<numseg; i++) {
string oid = get_block_oid(header, i);
io_ctx.remove(oid);
prog_ctx.update_progress(i * bsize, (numseg - start) * bsize);
uint64_t block_ofs = get_block_ofs(header, newsize);
if (block_ofs) {
ldout(cct, 2) << "trim_image object " << numseg << " truncate to " << block_ofs << dendl;
string oid = get_block_oid(header, start);
librados::ObjectWriteOperation write_op;
write_op.truncate(block_ofs);
io_ctx.operate(oid, &write_op);
start++;
}
if (start < numseg) {
ldout(cct, 2) << "trim_image objects " << start << " to " << (numseg-1) << dendl;
for (uint64_t i=start; i<numseg; i++) {
string oid = get_block_oid(header, i);
io_ctx.remove(oid);
prog_ctx.update_progress(i * bsize, (numseg - start) * bsize);
}
}
}