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

Merge pull request #5312 from xinxinsh/wip-sparse-copy

Browse Source 
use SEEK_HOLE/SEEK_DATA for sparse copy

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2015-08-04 13:58:21 +08:00
commit 1638525015
2 changed files with 17 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/os/FileStore.cc
View File

@ -3355,59 +3355,30 @@ int FileStore::_do_sparse_copy_range(int from, int to, uint64_t srcoff, uint64_t
{
dout(20) << __func__ << " " << srcoff << "~" << len << " to " << dstoff << dendl;
int r = 0;
struct fiemap *fiemap = NULL;
map<uint64_t, uint64_t> exomap;
// fiemap doesn't allow zero length
if (len == 0)
return 0;
r = backend->do_fiemap(from, srcoff, len, &fiemap);
if (r < 0) {
derr << "do_fiemap failed:" << srcoff << "~" << len << " = " << r << dendl;
return r;
}
// No need to copy
if (fiemap->fm_mapped_extents == 0)
return r;
struct fiemap_extent *extent = &fiemap->fm_extents[0];
/* start where we were asked to start */
if (extent->fe_logical < srcoff) {
extent->fe_length -= srcoff - extent->fe_logical;
extent->fe_logical = srcoff;
if (backend->has_seek_data_hole()) {
dout(15) << "seek_data/seek_hole " << from << " " << srcoff << "~" << len << dendl;
r = _do_seek_hole_data(from, srcoff, len, &exomap);
} else if (backend->has_fiemap()) {
dout(15) << "fiemap ioctl" << from << " " << srcoff << "~" << len << dendl;
r = _do_fiemap(from, srcoff, len, &exomap);
}
int64_t written = 0;
uint64_t i = 0;
while (i < fiemap->fm_mapped_extents) {
struct fiemap_extent *next = extent + 1;
dout(10) << __func__ << " fm_mapped_extents=" << fiemap->fm_mapped_extents
<< " fe_logical=" << extent->fe_logical << " fe_length="
<< extent->fe_length << dendl;
/* try to merge extents */
while ((i < fiemap->fm_mapped_extents - 1) &&
(extent->fe_logical + extent->fe_length == next->fe_logical)) {
next->fe_length += extent->fe_length;
next->fe_logical = extent->fe_logical;
extent = next;
next = extent + 1;
i++;
for (map<uint64_t, uint64_t>::iterator miter = exomap.begin(); miter != exomap.end(); ++miter) {
uint64_t it_off = miter->first - srcoff + dstoff;
r = _do_copy_range(from, to, miter->first, miter->second, it_off, true);
if (r < 0) {
r = -errno;
derr << "FileStore::_do_copy_range: copy error at " << miter->first << "~" << miter->second
<< " to " << it_off << ", " << cpp_strerror(r) << dendl;
break;
}
if (extent->fe_logical + extent->fe_length > srcoff + len)
extent->fe_length = srcoff + len - extent->fe_logical;
r = _do_copy_range(from, to, extent->fe_logical, extent->fe_length, extent->fe_logical - srcoff + dstoff, true);
if (r < 0)
goto out;
written += extent->fe_length;
i++;
extent++;
written += miter->second;
}
if (r >= 0) {

2
src/os/FileStore.h
View File

@ -781,7 +781,7 @@ protected:
return filestore->current_fn;
}
int _copy_range(int from, int to, uint64_t srcoff, uint64_t len, uint64_t dstoff) {
if (has_fiemap()) {
if (has_fiemap() || has_seek_data_hole()) {
return filestore->_do_sparse_copy_range(from, to, srcoff, len, dstoff);
} else {
return filestore->_do_copy_range(from, to, srcoff, len, dstoff);