archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-26 05:47:20 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix compile without dbengine" ()

Browse source 
Revert "Fix compile without dbengine ()"

This reverts commit 82a3519df3.
This commit is contained in:
Stelios Fragkakis 2025-03-19 14:52:09 +02:00 • committed by GitHub
parent 92e88f0c8d
commit 137a00b696
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 2 additions and 12 deletions

2
src/daemon/config/netdata-conf-backwards-compatibility.c
View file

@ -244,9 +244,7 @@ void netdata_conf_backwards_compatibility(void) {
found_old_config = true; found_old_config = true;
} }
#ifdef ENABLE_DBENGINE
legacy_multihost_db_space = found_old_config; legacy_multihost_db_space = found_old_config;
#endif
// ---------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------

7
src/daemon/daemon-shutdown.c
View file

@ -23,7 +23,6 @@ void abort_on_fatal_enable(void) {
abort_on_fatal = true; abort_on_fatal = true;
} }
#ifdef ENABLE_SENTRY
NEVER_INLINE NEVER_INLINE
static bool shutdown_on_fatal(void) { static bool shutdown_on_fatal(void) {
// keep this as a separate function, to have it logged like this in sentry // keep this as a separate function, to have it logged like this in sentry
@ -32,7 +31,6 @@ static bool shutdown_on_fatal(void) {
else else
return false; return false;
} }
#endif
void web_client_cache_destroy(void); void web_client_cache_destroy(void);
@ -104,14 +102,13 @@ void cancel_main_threads(void) {
static_threads = NULL; static_threads = NULL;
} }
#ifdef ENABLE_DBENGINE
static void *rrdeng_exit_background(void *ptr) { static void *rrdeng_exit_background(void *ptr) {
struct rrdengine_instance *ctx = ptr; struct rrdengine_instance *ctx = ptr;
rrdeng_exit(ctx); rrdeng_exit(ctx);
return NULL; return NULL;
} }
#ifdef ENABLE_DBENGINE
static void rrdeng_flush_everything_and_wait(bool wait_flush, bool wait_collectors, bool dirty_only) { static void rrdeng_flush_everything_and_wait(bool wait_flush, bool wait_collectors, bool dirty_only) {
static size_t starting_size_to_flush = 0; static size_t starting_size_to_flush = 0;
@ -341,7 +338,6 @@ static void netdata_cleanup_and_exit(EXIT_REASON reason, bool abnormal, bool exi
fprintf(stderr, "WARNING: There are %zu dictionaries with references in them, that cannot be destroyed.\n", fprintf(stderr, "WARNING: There are %zu dictionaries with references in them, that cannot be destroyed.\n",
dictionaries_referenced); dictionaries_referenced);
#ifdef ENABLE_DBENGINE
// destroy the caches in reverse order (extent and open depend on main cache) // destroy the caches in reverse order (extent and open depend on main cache)
fprintf(stderr, "Destroying extent cache (PGC)...\n"); fprintf(stderr, "Destroying extent cache (PGC)...\n");
pgc_destroy(extent_cache, false); pgc_destroy(extent_cache, false);
@ -355,7 +351,6 @@ static void netdata_cleanup_and_exit(EXIT_REASON reason, bool abnormal, bool exi
if(metrics_referenced) if(metrics_referenced)
fprintf(stderr, "WARNING: MRG had %zu metrics referenced.\n", fprintf(stderr, "WARNING: MRG had %zu metrics referenced.\n",
metrics_referenced); metrics_referenced);
#endif
fprintf(stderr, "Destroying UUIDMap...\n"); fprintf(stderr, "Destroying UUIDMap...\n");
size_t uuid_referenced = uuidmap_destroy(); size_t uuid_referenced = uuidmap_destroy();

3
src/daemon/pulse/pulse-daemon-memory.c
View file

@ -274,7 +274,6 @@ void pulse_daemon_memory_do(bool extended __maybe_unused) {
// ---------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------
#ifdef ENABLE_DBENGINE
OS_SYSTEM_MEMORY sm = os_system_memory(true); OS_SYSTEM_MEMORY sm = os_system_memory(true);
if (OS_SYSTEM_MEMORY_OK(sm) && dbengine_out_of_memory_protection) { if (OS_SYSTEM_MEMORY_OK(sm) && dbengine_out_of_memory_protection) {
static RRDSET *st_memory_available = NULL; static RRDSET *st_memory_available = NULL;
@ -305,6 +304,6 @@ void pulse_daemon_memory_do(bool extended __maybe_unused) {
rrdset_done(st_memory_available); rrdset_done(st_memory_available);
} }
#endif
// ---------------------------------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------------------------------
} }

2
src/web/api/web_api_v1.c
View file

@ -192,7 +192,6 @@ static struct web_api_command api_commands_v1[] = {
.callback = api_v1_aclk, .callback = api_v1_aclk,
.allow_subpaths = 0 .allow_subpaths = 0
}, },
#ifdef ENABLE_DBENGINE
{ {
// deprecated - use /api/v2/info // deprecated - use /api/v2/info
.api = "dbengine_stats", .api = "dbengine_stats",
@ -202,7 +201,6 @@ static struct web_api_command api_commands_v1[] = {
.callback = api_v1_dbengine_stats, .callback = api_v1_dbengine_stats,
.allow_subpaths = 0 .allow_subpaths = 0
}, },
#endif
{ {
.api = "ml_info", .api = "ml_info",
.hash = 0, .hash = 0,