mirror of
https://github.com/netdata/netdata.git
synced 2025-04-14 01:29:11 +00:00
Revert "Fix compile without dbengine" (#19905)
Revert "Fix compile without dbengine (#19902)"
This reverts commit 82a3519df3
.
This commit is contained in:
parent
92e88f0c8d
commit
137a00b696
4 changed files with 2 additions and 12 deletions
src
daemon
web/api
|
@ -244,9 +244,7 @@ void netdata_conf_backwards_compatibility(void) {
|
|||
found_old_config = true;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_DBENGINE
|
||||
legacy_multihost_db_space = found_old_config;
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@ void abort_on_fatal_enable(void) {
|
|||
abort_on_fatal = true;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_SENTRY
|
||||
NEVER_INLINE
|
||||
static bool shutdown_on_fatal(void) {
|
||||
// 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
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
void web_client_cache_destroy(void);
|
||||
|
||||
|
@ -104,14 +102,13 @@ void cancel_main_threads(void) {
|
|||
static_threads = NULL;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_DBENGINE
|
||||
static void *rrdeng_exit_background(void *ptr) {
|
||||
struct rrdengine_instance *ctx = ptr;
|
||||
rrdeng_exit(ctx);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
#ifdef ENABLE_DBENGINE
|
||||
static void rrdeng_flush_everything_and_wait(bool wait_flush, bool wait_collectors, bool dirty_only) {
|
||||
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",
|
||||
dictionaries_referenced);
|
||||
|
||||
#ifdef ENABLE_DBENGINE
|
||||
// destroy the caches in reverse order (extent and open depend on main cache)
|
||||
fprintf(stderr, "Destroying extent cache (PGC)...\n");
|
||||
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)
|
||||
fprintf(stderr, "WARNING: MRG had %zu metrics referenced.\n",
|
||||
metrics_referenced);
|
||||
#endif
|
||||
|
||||
fprintf(stderr, "Destroying UUIDMap...\n");
|
||||
size_t uuid_referenced = uuidmap_destroy();
|
||||
|
|
|
@ -274,7 +274,6 @@ void pulse_daemon_memory_do(bool extended __maybe_unused) {
|
|||
|
||||
// ----------------------------------------------------------------------------------------------------------------
|
||||
|
||||
#ifdef ENABLE_DBENGINE
|
||||
OS_SYSTEM_MEMORY sm = os_system_memory(true);
|
||||
if (OS_SYSTEM_MEMORY_OK(sm) && dbengine_out_of_memory_protection) {
|
||||
static RRDSET *st_memory_available = NULL;
|
||||
|
@ -305,6 +304,6 @@ void pulse_daemon_memory_do(bool extended __maybe_unused) {
|
|||
|
||||
rrdset_done(st_memory_available);
|
||||
}
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------------------------------------------
|
||||
}
|
||||
|
|
|
@ -192,7 +192,6 @@ static struct web_api_command api_commands_v1[] = {
|
|||
.callback = api_v1_aclk,
|
||||
.allow_subpaths = 0
|
||||
},
|
||||
#ifdef ENABLE_DBENGINE
|
||||
{
|
||||
// deprecated - use /api/v2/info
|
||||
.api = "dbengine_stats",
|
||||
|
@ -202,7 +201,6 @@ static struct web_api_command api_commands_v1[] = {
|
|||
.callback = api_v1_dbengine_stats,
|
||||
.allow_subpaths = 0
|
||||
},
|
||||
#endif
|
||||
{
|
||||
.api = "ml_info",
|
||||
.hash = 0,
|
||||
|
|
Loading…
Add table
Reference in a new issue