Skip to content

Flush RRD only when TXGs contain data #18138

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

Merged
behlendorf merged 1 commit into from
Feb 11, 2026
+20 −12
Merged

Flush RRD only when TXGs contain data #18138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 20 additions & 12 deletions module/zfs/spa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,20 +2142,21 @@ spa_destroy_aux_threads(spa_t *spa)
}

static void
spa_sync_time_logger(spa_t *spa, uint64_t txg)
spa_sync_time_logger(spa_t *spa, uint64_t txg, boolean_t force)
{
uint64_t curtime;
uint64_t curtime, dirty;
dmu_tx_t *tx;
dsl_pool_t *dp = spa->spa_dsl_pool;
uint64_t idx = txg & TXG_MASK;

if (!spa_writeable(spa)) {
return;
}
curtime = gethrestime_sec();
if (curtime < spa->spa_last_noted_txg_time + spa_note_txg_time) {
return;
}

if (txg > spa->spa_last_noted_txg) {
curtime = gethrestime_sec();
if (txg > spa->spa_last_noted_txg &&
(force ||
curtime >= spa->spa_last_noted_txg_time + spa_note_txg_time)) {
spa->spa_last_noted_txg_time = curtime;
spa->spa_last_noted_txg = txg;

Expand All @@ -2164,14 +2165,23 @@ spa_sync_time_logger(spa_t *spa, uint64_t txg)
mutex_exit(&spa->spa_txg_log_time_lock);
}

if (curtime < spa->spa_last_flush_txg_time + spa_flush_txg_time) {
if (!force &&
curtime < spa->spa_last_flush_txg_time + spa_flush_txg_time) {
return;
}
if (txg > spa_final_dirty_txg(spa)) {
return;
}
spa->spa_last_flush_txg_time = curtime;

mutex_enter(&dp->dp_lock);
dirty = dp->dp_dirty_pertxg[idx];
mutex_exit(&dp->dp_lock);
if (!force && dirty == 0) {
return;
}

spa->spa_last_flush_txg_time = curtime;
tx = dmu_tx_create_assigned(spa_get_dsl(spa), txg);

VERIFY0(zap_update(spa_meta_objset(spa), DMU_POOL_DIRECTORY_OBJECT,
Expand All @@ -2194,9 +2204,7 @@ spa_unload_sync_time_logger(spa_t *spa)
VERIFY0(dmu_tx_assign(tx, DMU_TX_WAIT));

txg = dmu_tx_get_txg(tx);
spa->spa_last_noted_txg_time = 0;
spa->spa_last_flush_txg_time = 0;
spa_sync_time_logger(spa, txg);
spa_sync_time_logger(spa, txg, B_TRUE);

dmu_tx_commit(tx);
}
Expand Down Expand Up @@ -10409,7 +10417,7 @@ spa_sync(spa_t *spa, uint64_t txg)
*/
brt_pending_apply(spa, txg);

spa_sync_time_logger(spa, txg);
spa_sync_time_logger(spa, txg, B_FALSE);

/*
* Lock out configuration changes.
Expand Down
Loading