Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSV-22900: Return the usable spa dspace in the performance metrics ioctl #89

Merged
merged 2 commits into from
Oct 12, 2023
Merged

SSV-22900: Return the usable spa dspace in the performance metrics ioctl #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d275c6
Tinker with slop space accounting with dedup
rincebrain Jul 13, 2021
588a6d5
SSV-22900: Return the usable spa dspace in the performance metrics io…
datacore-rm Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions module/os/windows/zfs/zfs_ioctl_os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,31 @@ zfs_vfs_ref(zfsvfs_t **zfvp)
return (error);
}

/*
* Returns the actual usable pool size adjusting the slop space which
* is same as reported by "zfs list" cmd.
*
* See the comment above spa_get_slop_space() for more details.
*/
static uint64_t
spa_get_usable_dspace(spa_t *spa)
{
uint64_t poolsize = 0;

if (spa != NULL) {
uint64_t space = metaslab_class_get_dspace(spa_normal_class(spa));
uint64_t resv = spa_get_slop_space(spa);

poolsize = (space >= resv) ? (space - resv) : 0;

TraceEvent(TRACE_VERBOSE,
"%s:%d: total_dspace: %llu, slop_space: %llu, poolsize: %llu, spa_dedup_dspace: %llu\n",
__func__, __LINE__, space, resv, poolsize, spa->spa_dedup_dspace);
}

return (poolsize);
}

extern kstat_t* perf_arc_ksp;
extern uint64_t getL2ArcAllocSize(arc_stats_t* arc_ptr);
NTSTATUS zpool_zfs_get_metrics(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp)
Expand Down Expand Up @@ -150,13 +175,17 @@ NTSTATUS zpool_zfs_get_metrics(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_
vdev_get_stats(spa_perf->spa_root_vdev, &vs);
perf->zpool_dedup_ratio = ddt_get_pool_dedup_ratio(spa_perf);
const char* healthState = spa_state_to_name(spa_perf);

// SSV-22900: get the actual usable spa pool size.
uint64_t pool_size = spa_get_usable_dspace(spa_perf);
uint64_t pool_alloc = (pool_size >= perf->available) ? (pool_size - perf->available) : 0;

spa_config_exit(spa_perf, SCL_ALL, FTAG);
mutex_exit(&spa_namespace_lock);

perf->zpool_allocated = vs.vs_alloc;
perf->zpool_size = vs.vs_space;
perf->zpool_allocated = pool_alloc;
perf->zpool_size = pool_size;
strcpy(perf->zpoolHealthState, healthState);

}
else
perf->zfs_volSize = getZvolSize(perf->name);
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/ddt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ ddt_get_dedup_histogram(spa_t *spa, ddt_histogram_t *ddh)
{
for (enum zio_checksum c = 0; c < ZIO_CHECKSUM_FUNCTIONS; c++) {
ddt_t *ddt = spa->spa_ddt[c];
for (enum ddt_type type = 0; type < DDT_TYPES; type++) {
for (enum ddt_type type = 0; type < DDT_TYPES && ddt; type++) {
for (enum ddt_class class = 0; class < DDT_CLASSES;
class++) {
ddt_histogram_add(ddh,
Expand Down
18 changes: 16 additions & 2 deletions module/zfs/spa_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,8 +1802,22 @@ spa_get_worst_case_asize(spa_t *spa, uint64_t lsize)
uint64_t
spa_get_slop_space(spa_t *spa)
{
uint64_t space = spa_get_dspace(spa);
uint64_t slop = MIN(space >> spa_slop_shift, spa_max_slop);
uint64_t space = 0;
uint64_t slop = 0;

/*
* Make sure spa_dedup_dspace has been set.
*/
if (spa->spa_dedup_dspace == ~0ULL)
spa_update_dspace(spa);

/*
* spa_get_dspace() includes the space only logically "used" by
* deduplicated data, so since it's not useful to reserve more
* space with more deduplicated data, we subtract that out here.
*/
space = spa_get_dspace(spa) - spa->spa_dedup_dspace;
slop = MIN(space >> spa_slop_shift, spa_max_slop);

/*
* Subtract the embedded log space, but no more than half the (3.2%)
Expand Down