Remove DBENGINE Warnings (Linux compilation) (#22103)
thiagoftsm committed
Apr 1, 2026 at 11:29 UTC
9e1423dbaba49a6bbdaf85fb5c95ff2e9d8cff66
2 files changed
+10
-10
src/database/engine/mrg-unittest.c
+2
-2
@@ -6,7 +6,7 @@
6
// Global dummy rrdengine_instances for tests
7
static struct rrdengine_instance test_ctx_0 = {0};
8
static struct rrdengine_instance test_ctx_1 = {0};
9
-static struct rrdengine_instance test_ctx_tier[4] = { {0}, {0}, {0}, {0} }; // For stress test tiers
9
+static struct rrdengine_instance test_ctx_tier[4] = { 0 }; // For stress test tiers
10
11
struct mrg_stress_entry {
12
nd_uuid_t uuid;
@@ -200,7 +200,7 @@ int mrg_unittest(void) {
200
// Phase 3: Measure final statistics
201
struct mrg_statistics final_stats;
202
mrg_get_statistics(mrg, &final_stats);
203
- fprintf(stderr, "DBENGINE METRIC: final MRG state - %zu entries, %zu acquired\n",
203
+ fprintf(stderr, "DBENGINE METRIC: final MRG state - %zu entries, %zd acquired\n",
204
final_stats.entries, final_stats.entries_acquired);
205
206
freez(t.array);
src/database/engine/rrdengine.c
+8
-8
@@ -1497,7 +1497,7 @@ void datafile_delete(
1497
// pending_deletion is already set, blocking new acquires.
1498
// Bail out and let the next rotation cycle retry - lockers
1499
// will drain over time since no new ones can be added.
1500
- netdata_log_error("DBENGINE: tier %d: " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1500
+ netdata_log_error("DBENGINE: tier %u: " 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, datafile->tier, fileno, attempts, datafile->users.lockers);
@@ -1508,7 +1508,7 @@ void datafile_delete(
1508
return;
1509
}
1510
1511
- netdata_log_info("DBENGINE: tier %d: waiting for " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1511
+ netdata_log_info("DBENGINE: tier %u: waiting for " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1512
" to be available for deletion, in use by %u users.",
1513
tier, datafile->tier, fileno, datafile->users.lockers);
1514
@@ -1528,7 +1528,7 @@ void datafile_delete(
1528
// }
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.",
1531
+ netdata_log_info("DBENGINE: tier %u: deleting " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " to maintain %s.",
1532
tier, datafile->tier, fileno, disk_time ? "disk quota" : "time retention");
1533
1534
if(worker)
@@ -1586,10 +1586,10 @@ void datafile_delete(
1586
bool exp_njfv2 = expected_journal_files & JOURNALFILE_DELETED_V2;
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
+ netdata_log_info("DBENGINE: tier %u: deleted " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (.ndf, .njf, .njfv2), reclaimed %s.",
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
+ netdata_log_info("DBENGINE: tier %u: deleted " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (.ndf, .njf), reclaimed %s.",
1593
tier, datafile_tier, fileno, size_for_humans);
1594
else if (del_ndf || del_njf || del_njfv2) {
1595
BUFFER *removed = buffer_create(0, NULL);
@@ -1607,18 +1607,18 @@ void datafile_delete(
1607
if (exp_njfv2 && !del_njfv2) { buffer_strcat(failed, sep); buffer_strcat(failed, ".njfv2"); }
1608
1609
if(buffer_strlen(failed))
1610
- netdata_log_error("DBENGINE: tier %d: partial delete of " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1610
+ netdata_log_error("DBENGINE: tier %u: partial delete of " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL
1611
" - removed: %s, failed: %s, reclaimed %s.",
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
+ netdata_log_info("DBENGINE: tier %u: deleted " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " (%s), reclaimed %s.",
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
+ netdata_log_error("DBENGINE: tier %u: failed to delete " DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL " to maintain %s.",
1622
tier, datafile_tier, fileno, disk_time ? "disk quota" : "time retention");
1623
}
1624