d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r336960: 9256 zfs send space estimation off by > 10% on some datasets

Browse Source 
illumos/illummos-gate@df477c0afa

Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Author:     Paul Dagnelie <pcd@delphix.com>
This commit is contained in:
Alexander Motin 2018-07-31 01:02:22 +00:00
commit 25f15f404d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336961
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
View File

@ -76,6 +76,11 @@ TUNABLE_INT("vfs.zfs.send_set_freerecords_bit", &zfs_send_set_freerecords_bit);
static char *dmu_recv_tag = "dmu_recv_tag";
const char *recv_clone_name = "%recv";
/*
* Use this to override the recordsize calculation for fast zfs send estimates.
*/
uint64_t zfs_override_estimate_recordsize = 0;
#define BP_SPAN(datablkszsec, indblkshift, level) \
(((uint64_t)datablkszsec) << (SPA_MINBLOCKSHIFT + \
(level) * (indblkshift - SPA_BLKPTRSHIFT)))
@ -1131,7 +1136,7 @@ static int
dmu_adjust_send_estimate_for_indirects(dsl_dataset_t *ds, uint64_t uncompressed,
uint64_t compressed, boolean_t stream_compressed, uint64_t *sizep)
{
int err;
int err = 0;
uint64_t size;
/*
* Assume that space (both on-disk and in-stream) is dominated by
@ -1144,7 +1149,9 @@ dmu_adjust_send_estimate_for_indirects(dsl_dataset_t *ds, uint64_t uncompressed,
VERIFY0(dmu_objset_from_ds(ds, &os));
/* Assume all (uncompressed) blocks are recordsize. */
if (os->os_phys->os_type == DMU_OST_ZVOL) {
if (zfs_override_estimate_recordsize != 0) {
recordsize = zfs_override_estimate_recordsize;
} else if (os->os_phys->os_type == DMU_OST_ZVOL) {
err = dsl_prop_get_int_ds(ds,
zfs_prop_to_name(ZFS_PROP_VOLBLOCKSIZE), &recordsize);
} else {