diff options
Diffstat (limited to 'daemon/unit_test.c')
-rw-r--r-- | daemon/unit_test.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/daemon/unit_test.c b/daemon/unit_test.c index b8d229316b..fbc47c7a54 100644 --- a/daemon/unit_test.c +++ b/daemon/unit_test.c @@ -1268,8 +1268,8 @@ int run_test(struct test *test) { fprintf(stderr, "\nRunning test '%s':\n%s\n", test->name, test->description); - default_rrd_memory_mode = RRD_MEMORY_MODE_ALLOC; - default_rrd_update_every = test->update_every; + default_storage_engine_id = STORAGE_ENGINE_ALLOC; + rrdb.default_update_every = test->update_every; char name[101]; snprintfz(name, 100, "unittest-%s", test->name); @@ -1537,8 +1537,8 @@ int unit_test(long delay, long shift) snprintfz(name, 100, "unittest-%d-%ld-%ld", repeat, delay, shift); //debug_flags = 0xffffffff; - default_rrd_memory_mode = RRD_MEMORY_MODE_ALLOC; - default_rrd_update_every = 1; + default_storage_engine_id = STORAGE_ENGINE_ALLOC; + rrdb.default_update_every = 1; int do_abs = 1; int do_inc = 1; @@ -1826,11 +1826,11 @@ static inline void rrddim_set_by_pointer_fake_time(RRDDIM *rd, collected_number if(unlikely(v > rd->collector.collected_value_max)) rd->collector.collected_value_max = v; } -static RRDHOST *dbengine_rrdhost_find_or_create(char *name) +static RRDHOST *dbengine_rrdhost_get_or_create(char *name) { /* We don't want to drop metrics when generating load, we prefer to block data generation itself */ - return rrdhost_find_or_create( + return rrdhost_get_or_create( name , name , name @@ -1841,9 +1841,9 @@ static RRDHOST *dbengine_rrdhost_find_or_create(char *name) , "" , program_name , program_version - , default_rrd_update_every - , default_rrd_history_entries - , RRD_MEMORY_MODE_DBENGINE + , rrdb.default_update_every + , rrdb.default_rrd_history_entries + , STORAGE_ENGINE_DBENGINE , default_health_enabled , default_rrdpush_enabled , default_rrdpush_destination @@ -1934,7 +1934,7 @@ static time_t test_dbengine_create_metrics(RRDSET *st[CHARTS], RRDDIM *rd[CHARTS // feed it with the test data for (i = 0 ; i < CHARTS ; ++i) { for (j = 0 ; j < DIMS ; ++j) { - storage_engine_store_change_collection_frequency(rd[i][j]->tiers[0].db_collection_handle, update_every); + storage_engine_store_change_collection_frequency(st[i]->storage_engine_id, rd[i][j]->tiers[0].db_collection_handle, update_every); rd[i][j]->collector.last_collected_time.tv_sec = st[i]->last_collected_time.tv_sec = st[i]->last_updated.tv_sec = time_now; @@ -1985,7 +1985,7 @@ static int test_dbengine_check_metrics(RRDSET *st[CHARTS], RRDDIM *rd[CHARTS][DI time_now = time_start + (c + 1) * update_every; for (i = 0 ; i < CHARTS ; ++i) { for (j = 0; j < DIMS; ++j) { - storage_engine_query_init(rd[i][j]->tiers[0].backend, rd[i][j]->tiers[0].db_metric_handle, &handle, time_now, time_now + QUERY_BATCH * update_every, STORAGE_PRIORITY_NORMAL); + storage_engine_query_init(st[i]->storage_engine_id, rd[i][j]->tiers[0].db_metric_handle, &handle, time_now, time_now + QUERY_BATCH * update_every, STORAGE_PRIORITY_NORMAL); for (k = 0; k < QUERY_BATCH; ++k) { last = ((collected_number)i * DIMS) * REGION_POINTS[current_region] + j * REGION_POINTS[current_region] + c + k; @@ -2120,10 +2120,10 @@ int test_dbengine(void) error_log_limit_unlimited(); fprintf(stderr, "\nRunning DB-engine test\n"); - default_rrd_memory_mode = RRD_MEMORY_MODE_DBENGINE; + default_storage_engine_id = STORAGE_ENGINE_DBENGINE; fprintf(stderr, "Initializing localhost with hostname 'unittest-dbengine'"); - host = dbengine_rrdhost_find_or_create("unittest-dbengine"); + host = dbengine_rrdhost_get_or_create("unittest-dbengine"); if (NULL == host) return 1; @@ -2234,9 +2234,9 @@ int test_dbengine(void) } rrd_wrlock(); - rrdeng_prepare_exit((struct rrdengine_instance *)host->db[0].instance); + rrdeng_prepare_exit(host->db[0].instance); rrdhost_delete_charts(host); - rrdeng_exit((struct rrdengine_instance *)host->db[0].instance); + rrdeng_exit(host->db[0].instance); rrd_unlock(); return errors + value_errors + time_errors; @@ -2336,17 +2336,17 @@ void generate_dbengine_dataset(unsigned history_seconds) int i; time_t time_present; - default_rrd_memory_mode = RRD_MEMORY_MODE_DBENGINE; - default_rrdeng_page_cache_mb = 128; + default_storage_engine_id = STORAGE_ENGINE_DBENGINE; + rrdb.default_rrdeng_page_cache_mb = 128; // Worst case for uncompressible data - default_rrdeng_disk_quota_mb = (((uint64_t)DSET_DIMS * DSET_CHARTS) * sizeof(storage_number) * history_seconds) / + rrdb.default_rrdeng_disk_quota_mb = (((uint64_t)DSET_DIMS * DSET_CHARTS) * sizeof(storage_number) * history_seconds) / (1024 * 1024); - default_rrdeng_disk_quota_mb -= default_rrdeng_disk_quota_mb * EXPECTED_COMPRESSION_RATIO / 100; + rrdb.default_rrdeng_disk_quota_mb -= rrdb.default_rrdeng_disk_quota_mb * EXPECTED_COMPRESSION_RATIO / 100; error_log_limit_unlimited(); fprintf(stderr, "Initializing localhost with hostname 'dbengine-dataset'"); - host = dbengine_rrdhost_find_or_create("dbengine-dataset"); + host = dbengine_rrdhost_get_or_create("dbengine-dataset"); if (NULL == host) return; @@ -2381,7 +2381,7 @@ void generate_dbengine_dataset(unsigned history_seconds) } freez(thread_info); rrd_wrlock(); - rrdhost_free___while_having_rrd_wrlock(localhost, true); + rrdhost_free___while_having_rrd_wrlock(rrdb.localhost, true); rrd_unlock(); } @@ -2429,7 +2429,7 @@ static void query_dbengine_chart(void *arg) if (thread_info->delete_old_data) { /* A time window of twice the disk space is sufficient for compression space savings of up to 50% */ - time_approx_min = time_max - (default_rrdeng_disk_quota_mb * 2 * 1024 * 1024) / + time_approx_min = time_max - (rrdb.default_rrdeng_disk_quota_mb * 2 * 1024 * 1024) / (((uint64_t) DSET_DIMS * DSET_CHARTS) * sizeof(storage_number)); time_min = MAX(time_min, time_approx_min); } @@ -2441,7 +2441,7 @@ static void query_dbengine_chart(void *arg) time_before = MIN(time_after + duration, time_max); /* up to 1 hour queries */ } - storage_engine_query_init(rd->tiers[0].backend, rd->tiers[0].db_metric_handle, &handle, time_after, time_before, STORAGE_PRIORITY_NORMAL); + storage_engine_query_init(st->storage_engine_id, rd->tiers[0].db_metric_handle, &handle, time_after, time_before, STORAGE_PRIORITY_NORMAL); ++thread_info->queries_nr; for (time_now = time_after ; time_now <= time_before ; time_now += update_every) { generatedv = generate_dbengine_chart_value(i, j, time_now); @@ -2529,23 +2529,23 @@ void dbengine_stress_test(unsigned TEST_DURATION_SEC, unsigned DSET_CHARTS, unsi if (PAGE_CACHE_MB < RRDENG_MIN_PAGE_CACHE_SIZE_MB) PAGE_CACHE_MB = RRDENG_MIN_PAGE_CACHE_SIZE_MB; - default_rrd_memory_mode = RRD_MEMORY_MODE_DBENGINE; - default_rrdeng_page_cache_mb = PAGE_CACHE_MB; + default_storage_engine_id = STORAGE_ENGINE_DBENGINE; + rrdb.default_rrdeng_page_cache_mb = PAGE_CACHE_MB; if (DISK_SPACE_MB) { fprintf(stderr, "By setting disk space limit data are allowed to be deleted. " "Data validation is turned off for this run.\n"); - default_rrdeng_disk_quota_mb = DISK_SPACE_MB; + rrdb.default_rrdeng_disk_quota_mb = DISK_SPACE_MB; } else { // Worst case for uncompressible data - default_rrdeng_disk_quota_mb = + rrdb.default_rrdeng_disk_quota_mb = (((uint64_t) DSET_DIMS * DSET_CHARTS) * sizeof(storage_number) * HISTORY_SECONDS) / (1024 * 1024); - default_rrdeng_disk_quota_mb -= default_rrdeng_disk_quota_mb * EXPECTED_COMPRESSION_RATIO / 100; + rrdb.default_rrdeng_disk_quota_mb -= rrdb.default_rrdeng_disk_quota_mb * EXPECTED_COMPRESSION_RATIO / 100; } fprintf(stderr, "Initializing localhost with hostname 'dbengine-stress-test'\n"); (void) sql_init_database(DB_CHECK_NONE, 1); - host = dbengine_rrdhost_find_or_create("dbengine-stress-test"); + host = dbengine_rrdhost_get_or_create("dbengine-stress-test"); if (NULL == host) return; @@ -2643,9 +2643,9 @@ void dbengine_stress_test(unsigned TEST_DURATION_SEC, unsigned DSET_CHARTS, unsi } freez(query_threads); rrd_wrlock(); - rrdeng_prepare_exit((struct rrdengine_instance *)host->db[0].instance); + rrdeng_prepare_exit(host->db[0].instance); rrdhost_delete_charts(host); - rrdeng_exit((struct rrdengine_instance *)host->db[0].instance); + rrdeng_exit(host->db[0].instance); rrd_unlock(); } |