ceph: allow object copies across different filesystems in the same cluster
PATCH v3 1/1 ceph: allow object copies across different filesystems in the same cluster
OSDs are able to perform object copies across different pools. Thus, there's no need to prevent copy_file_range from doing remote copies if the source and destination superblocks are different. Only return -EXDEV if they have different fsid (the cluster ID).
--- fs/ceph/file.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
Hi,
Here's the changelog:
* since v2
- single dout() in error path
* since v1:
- Dropped have_fsid checks on client structs
- Use %pU to print the fsid instead of raw hex strings (%*ph)
- Fixed 'To:' field in email so that this time the patch hits vger
Cheers,
--
Luis
fs/ceph/file.c +13 -4
@@ -1904,6 +1904,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,struct ceph_inode_info *src_ci =ceph_inode (src_inode);struct ceph_inode_info *dst_ci =ceph_inode (dst_inode);struct ceph_cap_flush *prealloc_cf; +struct ceph_fs_client *src_fsc =ceph_inode_to_client (src_inode);struct ceph_object_locator src_oloc, dst_oloc;struct ceph_object_id src_oid, dst_oid;loff_t endoff =0 , size;
@@ -1915,8 +1916,16 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,if (src_inode == dst_inode)return -EINVAL ; -if (src_inode->i_sb != dst_inode->i_sb) -return -EXDEV ; +if (src_inode->i_sb != dst_inode->i_sb) { +struct ceph_fs_client *dst_fsc =ceph_inode_to_client (dst_inode); + +if (ceph_fsid_compare (&src_fsc->client->fsid, + &dst_fsc->client->fsid)) { +dout ("Copying files across clusters: src: %pU dst: %pU\n" , + &src_fsc->client->fsid, &dst_fsc->client->fsid); +return -EXDEV ; + } + }if (ceph_snap (dst_inode) !=CEPH_NOSNAP )return -EROFS ;
@@ -1928,7 +1937,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,* efficient). */ -if (ceph_test_mount_opt (ceph_inode_to_client (src_inode),NOCOPYFROM )) +if (ceph_test_mount_opt (src_fsc,NOCOPYFROM ))return -EOPNOTSUPP ; if ((src_ci->i_layout.stripe_unit != dst_ci->i_layout.stripe_unit) ||
@@ -2044,7 +2053,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, dst_ci->i_vino.ino, dst_objnum);/* Do an object remote copy */ err = ceph_osdc_copy_from( - &ceph_inode_to_client(src_inode)->client->osdc, + &src_fsc->client->osdc, src_ci->i_vino.snap, 0, &src_oid, &src_oloc, CEPH_OSD_OP_FLAG_FADVISE_SEQUENTIAL |
Quoted 69 lines · Luis Henriques
OSDs are able to perform object copies across different pools. Thus, there's no need to prevent
copy_file_rangefrom doing remote copies if the source and destination superblocks are different. Only return-EXDEVif they have different fsid (the cluster ID).Signed-off-by Luis Henriques <[email protected]>--- fs/ceph/file.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)Hi,
Here's the changelog:
* since v2
- single
dout()in error path* since v1:
- Dropped
have_fsidchecks on client structs
- Use %pU to print the fsid instead of raw hex strings (%*ph)
- Fixed 'To:' field in email so that this time the patch hits vgerCheers,
--
Luisfs/ceph/file.c +12
-3@@ -1904,6 +1904,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,struct ceph_inode_info *src_ci =ceph_inode (src_inode);struct ceph_inode_info *dst_ci =ceph_inode (dst_inode);struct ceph_cap_flush *prealloc_cf; +struct ceph_fs_client *src_fsc =ceph_inode_to_client (src_inode);struct ceph_object_locator src_oloc, dst_oloc;struct ceph_object_id src_oid, dst_oid;loff_t endoff =0 , size;@@ -1915,8 +1916,16 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,if (src_inode == dst_inode)return -EINVAL ; -if (src_inode->i_sb != dst_inode->i_sb) -return -EXDEV ; +if (src_inode->i_sb != dst_inode->i_sb) { +struct ceph_fs_client *dst_fsc =ceph_inode_to_client (dst_inode); + +if (ceph_fsid_compare (&src_fsc->client->fsid, + &dst_fsc->client->fsid)) { +dout ("Copying files across clusters: src: %pU dst: %pU\n" , + &src_fsc->client->fsid, &dst_fsc->client->fsid); +return -EXDEV ; + } + }if (ceph_snap (dst_inode) !=CEPH_NOSNAP )return -EROFS ;@@ -1928,7 +1937,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,* efficient). */ -if (ceph_test_mount_opt (ceph_inode_to_client (src_inode),NOCOPYFROM )) +if (ceph_test_mount_opt (src_fsc,NOCOPYFROM ))return -EOPNOTSUPP ; if ((src_ci->i_layout.stripe_unit != dst_ci->i_layout.stripe_unit) ||
fs/ceph/file.c static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, · line 2059
Quoted 8 lines
fs/ceph/file.c +1
-1@@ -2044,7 +2053,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, dst_ci->i_vino.ino, dst_objnum);/* Do an object remote copy */ err = ceph_osdc_copy_from( - &ceph_inode_to_client(src_inode)->client->osdc, + &src_fsc->client->osdc, src_ci->i_vino.snap, 0, &src_oid, &src_oloc, CEPH_OSD_OP_FLAG_FADVISE_SEQUENTIAL |
Thanks Luis. Merged into testing branch.
Signature · 1 line
Jeff Layton <[email protected]>