Remove unused config options and functions (#14542)
* Remove unused config options and declarations * Remove unused config options, declarations and commented out code * Remove datafile_acquire_dup as it is not used
Stelios Fragkakis committed
Feb 16, 2023 at 10:59 UTC
fe5f3b64927e9efb26bdf6d6401e6cd078b738ea
6 files changed
-101
database/engine/datafile.c
-11
@@ -34,17 +34,6 @@ static struct rrdengine_datafile *datafile_alloc_and_init(struct rrdengine_insta
34
return datafile;
35
}
36
37
-void datafile_acquire_dup(struct rrdengine_datafile *df) {
38
- netdata_spinlock_lock(&df->users.spinlock);
39
-
40
- if(!df->users.lockers)
41
- fatal("DBENGINE: datafile is not acquired to duplicate");
42
-
43
- df->users.lockers++;
44
-
45
- netdata_spinlock_unlock(&df->users.spinlock);
46
-}
47
-
37
bool datafile_acquire(struct rrdengine_datafile *df, DATAFILE_ACQUIRE_REASONS reason) {
38
bool ret;
39
database/engine/datafile.h
-1
@@ -70,7 +70,6 @@ struct rrdengine_datafile {
70
} extent_queries;
71
};
72
73
-void datafile_acquire_dup(struct rrdengine_datafile *df);
73
bool datafile_acquire(struct rrdengine_datafile *df, DATAFILE_ACQUIRE_REASONS reason);
74
void datafile_release(struct rrdengine_datafile *df, DATAFILE_ACQUIRE_REASONS reason);
75
bool datafile_acquire_for_deletion(struct rrdengine_datafile *df);
database/engine/rrdengineapi.c
-2
@@ -35,8 +35,6 @@ __attribute__((constructor)) void initialize_multidb_ctx(void) {
35
multidb_ctx[4] = &multidb_ctx_storage_tier4;
36
}
37
38
-int default_rrdeng_page_fetch_timeout = 3;
39
-int default_rrdeng_page_fetch_retries = 3;
38
int db_engine_journal_check = 0;
39
int default_rrdeng_disk_quota_mb = 256;
40
int default_multidb_disk_quota_mb = 256;
database/engine/rrdengineapi.h
-7
@@ -12,11 +12,7 @@
12
13
#define RRDENG_FD_BUDGET_PER_INSTANCE (50)
14
15
-extern int db_engine_use_malloc;
16
-extern int default_rrdeng_page_fetch_timeout;
17
-extern int default_rrdeng_page_fetch_retries;
15
extern int default_rrdeng_page_cache_mb;
19
-extern int db_engine_journal_indexing;
16
extern int db_engine_journal_check;
17
extern int default_rrdeng_disk_quota_mb;
18
extern int default_multidb_disk_quota_mb;
@@ -27,9 +23,6 @@ extern size_t tier_page_size[];
23
#define CTX_POINT_SIZE_BYTES(ctx) page_type_size[(ctx)->config.page_type]
24
25
void rrdeng_generate_legacy_uuid(const char *dim_id, const char *chart_id, uuid_t *ret_uuid);
30
-void rrdeng_convert_legacy_uuid_to_multihost(char machine_guid[GUID_LEN + 1], uuid_t *legacy_uuid,
31
- uuid_t *ret_uuid);
32
-
26
27
STORAGE_METRIC_HANDLE *rrdeng_metric_get_or_create(RRDDIM *rd, STORAGE_INSTANCE *db_instance);
28
STORAGE_METRIC_HANDLE *rrdeng_metric_get(STORAGE_INSTANCE *db_instance, uuid_t *uuid);
database/engine/rrdenginelib.c
-66
@@ -1,72 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
#include "rrdengine.h"
3
4
-#define BUFSIZE (512)
5
-
6
-/* Caller must hold descriptor lock */
7
-//void print_page_cache_descr(struct rrdeng_page_descr *descr, const char *msg, bool log_debug)
8
-//{
9
-// if(log_debug && !(debug_flags & D_RRDENGINE))
10
-// return;
11
-//
12
-// BUFFER *wb = buffer_create(512);
13
-//
14
-// if(!descr) {
15
-// buffer_sprintf(wb, "DBENGINE: %s : descr is NULL", msg);
16
-// }
17
-// else {
18
-// struct page_cache_descr *pg_cache_descr = descr->pg_cache_descr;
19
-// char uuid_str[UUID_STR_LEN];
20
-//
21
-// uuid_unparse_lower(*descr->id, uuid_str);
22
-// buffer_sprintf(wb, "DBENGINE: %s : page(%p) metric:%s, len:%"PRIu32", time:%"PRIu64"->%"PRIu64", update_every:%u, type:%u, xt_offset:",
23
-// msg,
24
-// pg_cache_descr->page, uuid_str,
25
-// descr->page_length,
26
-// (uint64_t)descr->start_time_ut,
27
-// (uint64_t)descr->end_time_ut,
28
-// (uint32_t)descr->update_every_s,
29
-// (uint32_t)descr->type
30
-// );
31
-// if (!descr->extent) {
32
-// buffer_strcat(wb, "N/A");
33
-// } else {
34
-// buffer_sprintf(wb, "%"PRIu64, descr->extent->offset);
35
-// }
36
-//
37
-// buffer_sprintf(wb, ", flags:0x%2.2lX refcnt:%u", pg_cache_descr->flags, pg_cache_descr->refcnt);
38
-// }
39
-//
40
-// if(log_debug)
41
-// debug(D_RRDENGINE, "%s", buffer_tostring(wb));
42
-// else
43
-// internal_error(true, "%s", buffer_tostring(wb));
44
-//
45
-// buffer_free(wb);
46
-//}
47
-//
48
-//void print_page_descr(struct rrdeng_page_descr *descr)
49
-//{
50
-// char uuid_str[UUID_STR_LEN];
51
-// char str[BUFSIZE + 1];
52
-// int pos = 0;
53
-//
54
-// uuid_unparse_lower(*descr->id, uuid_str);
55
-// pos += snprintfz(str, BUFSIZE - pos, "id=%s\n"
56
-// "--->len:%"PRIu32" time:%"PRIu64"->%"PRIu64" xt_offset:",
57
-// uuid_str,
58
-// descr->page_length,
59
-// (uint64_t)descr->start_time_ut,
60
-// (uint64_t)descr->end_time_ut);
61
-// if (!descr->extent) {
62
-// pos += snprintfz(str + pos, BUFSIZE - pos, "N/A");
63
-// } else {
64
-// pos += snprintfz(str + pos, BUFSIZE - pos, "%"PRIu64, descr->extent->offset);
65
-// }
66
-// snprintfz(str + pos, BUFSIZE - pos, "\n\n");
67
-// fputs(str, stderr);
68
-//}
69
-
4
int check_file_properties(uv_file file, uint64_t *file_size, size_t min_size)
5
{
6
int ret;
database/rrdhost.c
-14
@@ -811,20 +811,6 @@ void dbengine_init(char *hostname) {
811
bool parallel_initialization = (storage_tiers <= (size_t)get_netdata_cpus()) ? true : false;
812
parallel_initialization = config_get_boolean(CONFIG_SECTION_DB, "dbengine parallel initialization", parallel_initialization);
813
814
- default_rrdeng_page_fetch_timeout = (int) config_get_number(CONFIG_SECTION_DB, "dbengine page fetch timeout secs", PAGE_CACHE_FETCH_WAIT_TIMEOUT);
815
- if (default_rrdeng_page_fetch_timeout < 1) {
816
- info("'dbengine page fetch timeout secs' cannot be %d, using 1", default_rrdeng_page_fetch_timeout);
817
- default_rrdeng_page_fetch_timeout = 1;
818
- config_set_number(CONFIG_SECTION_DB, "dbengine page fetch timeout secs", default_rrdeng_page_fetch_timeout);
819
- }
820
-
821
- default_rrdeng_page_fetch_retries = (int) config_get_number(CONFIG_SECTION_DB, "dbengine page fetch retries", MAX_PAGE_CACHE_FETCH_RETRIES);
822
- if (default_rrdeng_page_fetch_retries < 1) {
823
- info("\"dbengine page fetch retries\" found in netdata.conf cannot be %d, using 1", default_rrdeng_page_fetch_retries);
824
- default_rrdeng_page_fetch_retries = 1;
825
- config_set_number(CONFIG_SECTION_DB, "dbengine page fetch retries", default_rrdeng_page_fetch_retries);
826
- }
827
-
814
struct dbengine_initialization tiers_init[RRD_STORAGE_TIERS] = {};
815
816
size_t created_tiers = 0;