Fix wrong DBENGINE file names in logs (#22053)
* Refactor DBENGINE log messages for consistency in tier and journal file references. * Refactor DBENGINE log messages to use `datafile_tier` for improved clarity in tier-specific deletion reporting.
Stelios Fragkakis committed
Mar 27, 2026 at 00:31 UTC
97e8013121a3f5ed618d12d53db0fea97d7c9d8b
3 files changed
+19
-18
src/database/engine/datafile.c
+3
-3
@@ -135,7 +135,7 @@ bool datafile_acquire_for_deletion(struct rrdengine_datafile *df, bool is_shutdo
135
136
if(marked_pending)
137
netdata_log_info("DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " is pending deletion (%s)",
138
- datafile_ctx(df)->config.tier, datafile_ctx(df)->config.tier, df->fileno, is_shutdown ? "shutdown" : "runtime");
138
+ datafile_ctx(df)->config.tier, df->tier, df->fileno, is_shutdown ? "shutdown" : "runtime");
139
140
if(can_be_deleted)
141
return true;
@@ -159,7 +159,7 @@ bool datafile_acquire_for_deletion(struct rrdengine_datafile *df, bool is_shutdo
159
if(df->users.available) {
160
df->users.available = false;
161
netdata_log_info("DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " entered deletion phase-2 (new users blocked)",
162
- datafile_ctx(df)->config.tier, datafile_ctx(df)->config.tier, df->fileno);
162
+ datafile_ctx(df)->config.tier, df->tier, df->fileno);
163
}
164
165
if(!df->users.lockers)
@@ -606,7 +606,7 @@ int create_new_datafile_pair(struct rrdengine_instance *ctx)
606
607
nd_log(NDLS_DAEMON, NDLP_INFO,
608
"DBENGINE: tier %d: created " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (.ndf, .njf).",
609
- ctx->config.tier, ctx->config.tier, datafile->fileno);
609
+ ctx->config.tier, datafile->tier, datafile->fileno);
610
611
ctx_current_disk_space_increase(ctx, datafile->pos + journalfile->unsafe.pos);
612
datafile_list_insert(ctx, datafile);
src/database/engine/journalfile.c
+4
-4
@@ -1373,8 +1373,8 @@ bool journalfile_migrate_to_v2_callback(Word_t section, unsigned datafile_fileno
1373
1374
journalfile_v2_generate_path(datafile, path, sizeof(path));
1375
1376
- netdata_log_info("DBENGINE: tier %d: indexing " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL ".njfv2: extents %zu, metrics %zu, pages %zu",
1377
- datafile_ctx(datafile)->config.tier, datafile_ctx(datafile)->config.tier, datafile->fileno,
1376
+ netdata_log_info("DBENGINE: tier %d: indexing journal v2 file %s: extents %zu, metrics %zu, pages %zu",
1377
+ datafile_ctx(datafile)->config.tier, path,
1378
number_of_extents,
1379
number_of_metrics,
1380
number_of_pages);
@@ -1567,8 +1567,8 @@ bool journalfile_migrate_to_v2_callback(Word_t section, unsigned datafile_fileno
1567
1568
char size_for_humans[128];
1569
size_snprintf(size_for_humans, sizeof(size_for_humans), total_file_size, "B", false);
1570
- netdata_log_info("DBENGINE: tier %d: migrated " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL ".njfv2, %s",
1571
- ctx->config.tier, ctx->config.tier, datafile->fileno, size_for_humans);
1570
+ netdata_log_info("DBENGINE: tier %d: migrated journal v2 file %s, %s",
1571
+ ctx->config.tier, path, size_for_humans);
1572
1573
// msync(data_start, total_file_size, MS_SYNC);
1574
journalfile_v2_data_set(journalfile, fd_v2, data_start, total_file_size);
src/database/engine/rrdengine.c
+12
-11
@@ -1500,7 +1500,7 @@ void datafile_delete(
1500
netdata_log_error("DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1501
" could not be acquired for deletion after %zu attempts (%u lockers remain)"
1502
" - will retry on next rotation",
1503
- tier, tier, fileno, attempts, datafile->users.lockers);
1503
+ tier, datafile->tier, fileno, attempts, datafile->users.lockers);
1504
1505
if(worker)
1506
worker_is_idle();
@@ -1510,7 +1510,7 @@ void datafile_delete(
1510
1511
netdata_log_info("DBENGINE: tier %d: waiting for " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1512
" to be available for deletion, in use by %u users.",
1513
- tier, tier, fileno, datafile->users.lockers);
1513
+ tier, datafile->tier, fileno, datafile->users.lockers);
1514
1515
__atomic_add_fetch(&rrdeng_cache_efficiency_stats.datafile_deletion_spin, 1, __ATOMIC_RELAXED);
1516
sleep_usec(1 * USEC_PER_SEC);
@@ -1529,7 +1529,7 @@ void datafile_delete(
1529
1530
__atomic_add_fetch(&rrdeng_cache_efficiency_stats.datafile_deletion_started, 1, __ATOMIC_RELAXED);
1531
netdata_log_info("DBENGINE: tier %d: deleting " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " to maintain %s.",
1532
- tier, tier, fileno, disk_time ? "disk quota" : "time retention");
1532
+ tier, datafile->tier, fileno, disk_time ? "disk quota" : "time retention");
1533
1534
if(worker)
1535
worker_is_busy(UV_EVENT_DBENGINE_DATAFILE_DELETE);
@@ -1539,6 +1539,7 @@ void datafile_delete(
1539
uint8_t deleted_journal_files = 0;
1540
uint8_t expected_journal_files = JOURNALFILE_DELETED_V1;
1541
bool deleted_datafile = false;
1542
+ unsigned datafile_tier = datafile->tier;
1543
int ret;
1544
1545
netdata_rwlock_wrlock(&ctx->datafiles.rwlock);
@@ -1586,10 +1587,10 @@ void datafile_delete(
1587
1588
if (del_ndf && del_njf && del_njfv2)
1589
netdata_log_info("DBENGINE: tier %d: deleted " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (.ndf, .njf, .njfv2), reclaimed %s.",
1589
- tier, tier, fileno, size_for_humans);
1590
+ tier, datafile_tier, fileno, size_for_humans);
1591
else if (del_ndf && del_njf && !exp_njfv2)
1592
netdata_log_info("DBENGINE: tier %d: deleted " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (.ndf, .njf), reclaimed %s.",
1592
- tier, tier, fileno, size_for_humans);
1593
+ tier, datafile_tier, fileno, size_for_humans);
1594
else if (del_ndf || del_njf || del_njfv2) {
1595
BUFFER *removed = buffer_create(0, NULL);
1596
BUFFER *failed = buffer_create(0, NULL);
@@ -1608,17 +1609,17 @@ void datafile_delete(
1609
if(buffer_strlen(failed))
1610
netdata_log_error("DBENGINE: tier %d: partial delete of " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1611
" - removed: %s, failed: %s, reclaimed %s.",
1611
- tier, tier, fileno,
1612
+ tier, datafile_tier, fileno,
1613
buffer_tostring(removed), buffer_tostring(failed), size_for_humans);
1614
else
1615
netdata_log_info("DBENGINE: tier %d: deleted " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (%s), reclaimed %s.",
1615
- tier, tier, fileno, buffer_tostring(removed), size_for_humans);
1616
+ tier, datafile_tier, fileno, buffer_tostring(removed), size_for_humans);
1617
buffer_free(removed);
1618
buffer_free(failed);
1619
}
1620
else
1621
netdata_log_error("DBENGINE: tier %d: failed to delete " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " to maintain %s.",
1621
- tier, tier, fileno, disk_time ? "disk quota" : "time retention");
1622
+ tier, datafile_tier, fileno, disk_time ? "disk quota" : "time retention");
1623
}
1624
1625
static void *database_rotate_tp_worker(struct rrdengine_instance *ctx __maybe_unused, void *data __maybe_unused, struct completion *completion __maybe_unused, uv_work_t *uv_work_req __maybe_unused) {
@@ -1976,7 +1977,7 @@ static struct rrdengine_datafile *release_and_aquire_next_datafile_for_indexing(
1977
return datafile;
1978
}
1979
nd_log_daemon(NDLP_INFO, "DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " cannot be locked for indexing after retries; skipping",
1979
- ctx->config.tier, ctx->config.tier, datafile->fileno);
1980
+ ctx->config.tier, datafile->tier, datafile->fileno);
1981
datafile = get_next_datafile(datafile, NULL, true);
1982
}
1983
netdata_rwlock_rdunlock(&ctx->datafiles.rwlock);
@@ -2004,7 +2005,7 @@ static void *journal_v2_indexing_tp_worker(struct rrdengine_instance *ctx, void
2005
nd_log_daemon(NDLP_NOTICE,
2006
"DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
2007
" needs to be indexed, but it has writers working on it - skipping it for now",
2007
- ctx->config.tier, ctx->config.tier, datafile->fileno);
2008
+ ctx->config.tier, datafile->tier, datafile->fileno);
2009
continue;
2010
}
2011
@@ -2016,7 +2017,7 @@ static void *journal_v2_indexing_tp_worker(struct rrdengine_instance *ctx, void
2017
break;
2018
}
2019
nd_log_daemon(NDLP_INFO, "DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " is ready to be indexed",
2019
- ctx->config.tier, ctx->config.tier, datafile->fileno);
2020
+ ctx->config.tier, datafile->tier, datafile->fileno);
2021
2022
pgc_open_cache_to_journal_v2(
2023
open_cache,