Revert "Fix compile without dbengine" (#19905)
Revert "Fix compile without dbengine (#19902)" This reverts commit 82a3519df3e1030c45af204ed2b98ef11a82cc54.
Stelios Fragkakis committed
Mar 19, 2025 at 14:52 UTC
137a00b696e9250d29ba02da22c1534a01526756
4 files changed
+2
-12
src/daemon/config/netdata-conf-backwards-compatibility.c
-2
@@ -244,9 +244,7 @@ void netdata_conf_backwards_compatibility(void) {
244
found_old_config = true;
245
}
246
247
-#ifdef ENABLE_DBENGINE
247
legacy_multihost_db_space = found_old_config;
249
-#endif
248
249
// ----------------------------------------------------------------------------------------------------------------
250
src/daemon/daemon-shutdown.c
+1
-6
@@ -23,7 +23,6 @@ void abort_on_fatal_enable(void) {
23
abort_on_fatal = true;
24
}
25
26
-#ifdef ENABLE_SENTRY
26
NEVER_INLINE
27
static bool shutdown_on_fatal(void) {
28
// keep this as a separate function, to have it logged like this in sentry
@@ -32,7 +31,6 @@ static bool shutdown_on_fatal(void) {
31
else
32
return false;
33
}
35
-#endif
34
35
void web_client_cache_destroy(void);
36
@@ -104,14 +102,13 @@ void cancel_main_threads(void) {
102
static_threads = NULL;
103
}
104
107
-#ifdef ENABLE_DBENGINE
105
static void *rrdeng_exit_background(void *ptr) {
106
struct rrdengine_instance *ctx = ptr;
107
rrdeng_exit(ctx);
108
return NULL;
109
}
110
114
-
111
+#ifdef ENABLE_DBENGINE
112
static void rrdeng_flush_everything_and_wait(bool wait_flush, bool wait_collectors, bool dirty_only) {
113
static size_t starting_size_to_flush = 0;
114
@@ -341,7 +338,6 @@ static void netdata_cleanup_and_exit(EXIT_REASON reason, bool abnormal, bool exi
338
fprintf(stderr, "WARNING: There are %zu dictionaries with references in them, that cannot be destroyed.\n",
339
dictionaries_referenced);
340
344
-#ifdef ENABLE_DBENGINE
341
// destroy the caches in reverse order (extent and open depend on main cache)
342
fprintf(stderr, "Destroying extent cache (PGC)...\n");
343
pgc_destroy(extent_cache, false);
@@ -355,7 +351,6 @@ static void netdata_cleanup_and_exit(EXIT_REASON reason, bool abnormal, bool exi
351
if(metrics_referenced)
352
fprintf(stderr, "WARNING: MRG had %zu metrics referenced.\n",
353
metrics_referenced);
358
-#endif
354
355
fprintf(stderr, "Destroying UUIDMap...\n");
356
size_t uuid_referenced = uuidmap_destroy();
src/daemon/pulse/pulse-daemon-memory.c
+1
-2
@@ -274,7 +274,6 @@ void pulse_daemon_memory_do(bool extended __maybe_unused) {
274
275
// ----------------------------------------------------------------------------------------------------------------
276
277
-#ifdef ENABLE_DBENGINE
277
OS_SYSTEM_MEMORY sm = os_system_memory(true);
278
if (OS_SYSTEM_MEMORY_OK(sm) && dbengine_out_of_memory_protection) {
279
static RRDSET *st_memory_available = NULL;
@@ -305,6 +304,6 @@ void pulse_daemon_memory_do(bool extended __maybe_unused) {
304
305
rrdset_done(st_memory_available);
306
}
308
-#endif
307
+
308
// ----------------------------------------------------------------------------------------------------------------
309
}
src/web/api/web_api_v1.c
-2
@@ -192,7 +192,6 @@ static struct web_api_command api_commands_v1[] = {
192
.callback = api_v1_aclk,
193
.allow_subpaths = 0
194
},
195
-#ifdef ENABLE_DBENGINE
195
{
196
// deprecated - use /api/v2/info
197
.api = "dbengine_stats",
@@ -202,7 +201,6 @@ static struct web_api_command api_commands_v1[] = {
201
.callback = api_v1_dbengine_stats,
202
.allow_subpaths = 0
203
},
205
-#endif
204
{
205
.api = "ml_info",
206
.hash = 0,