RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 06:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8050 from liewegas/wip-15077

Browse Source 
os/filestore: fix punch hole usage in _zero

Reviewed-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Sage Weil 2016-03-14 10:50:06 -04:00
commit 8c9190fae6
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/config_opts.h
View File

@ -1024,6 +1024,7 @@ OPTION(filestore_btrfs_clone_range, OPT_BOOL, true)
OPTION(filestore_zfs_snap, OPT_BOOL, false) // zfsonlinux is still unstable
OPTION(filestore_fsync_flushes_journal_data, OPT_BOOL, false)
OPTION(filestore_fiemap, OPT_BOOL, false) // (try to) use fiemap
OPTION(filestore_punch_hole, OPT_BOOL, false)
OPTION(filestore_seek_data_hole, OPT_BOOL, false) // (try to) use seek_data/hole
OPTION(filestore_fadvise, OPT_BOOL, true)
//collect device partition information for management application to use

62
src/os/filestore/FileStore.cc
View File

@ -3265,38 +3265,60 @@ int FileStore::_zero(const coll_t& cid, const ghobject_t& oid, uint64_t offset,
dout(15) << "zero " << cid << "/" << oid << " " << offset << "~" << len << dendl;
int ret = 0;
if (g_conf->filestore_punch_hole) {
#ifdef CEPH_HAVE_FALLOCATE
# if !defined(DARWIN) && !defined(__FreeBSD__)
# ifdef FALLOC_FL_KEEP_SIZE
// first try to punch a hole.
FDRef fd;
ret = lfn_open(cid, oid, false, &fd);
if (ret < 0) {
goto out;
}
// first try to punch a hole.
FDRef fd;
ret = lfn_open(cid, oid, false, &fd);
if (ret < 0) {
goto out;
}
// first try fallocate
ret = fallocate(**fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, offset, len);
if (ret < 0)
ret = -errno;
lfn_close(fd);
struct stat st;
ret = ::fstat(**fd, &st);
if (ret < 0) {
ret = -errno;
lfn_close(fd);
goto out;
}
if (ret >= 0 && m_filestore_sloppy_crc) {
int rc = backend->_crc_update_zero(**fd, offset, len);
assert(rc >= 0);
}
// first try fallocate
ret = fallocate(**fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE,
offset, len);
if (ret < 0) {
ret = -errno;
} else {
// ensure we extent file size, if needed
if (offset + len > st.st_size) {
ret = ::ftruncate(**fd, offset + len);
if (ret < 0) {
ret = -errno;
lfn_close(fd);
goto out;
}
}
}
lfn_close(fd);
if (ret == 0)
goto out; // yay!
if (ret != -EOPNOTSUPP)
goto out; // some other error
if (ret >= 0 && m_filestore_sloppy_crc) {
int rc = backend->_crc_update_zero(**fd, offset, len);
assert(rc >= 0);
}
if (ret == 0)
goto out; // yay!
if (ret != -EOPNOTSUPP)
goto out; // some other error
# endif
# endif
#endif
}
// lame, kernel is old and doesn't support it.
// write zeros.. yuck!
dout(20) << "zero FALLOC_FL_PUNCH_HOLE not supported, falling back to writing zeros" << dendl;
dout(20) << "zero falling back to writing zeros" << dendl;
{
bufferlist bl;
bl.append_zero(len);