Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Acquire and release metric as needed during journal v2 migration #21200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stelfrag merged 1 commit into from
Oct 24, 2025
Merged

Acquire and release metric as needed during journal v2 migration #21200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/database/engine/cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2477,6 +2477,8 @@ void pgc_open_cache_to_journal_v2(
continue;
}

METRIC *metric = mrg_metric_dup(main_mrg, (METRIC *)page->metric_id);

page_flag_set(page, PGC_PAGE_IS_BEING_MIGRATED_TO_V2);

pgc_queue_unlock(cache, &cache->hot);
Expand Down Expand Up @@ -2516,8 +2518,9 @@ void pgc_open_cache_to_journal_v2(

struct jv2_metrics_info *mi;
if(!*PValue) {
mi = aral_mallocz(ar_mi); // callocz(1, sizeof(struct jv2_metrics_info));
mi->uuid = mrg_metric_uuid(main_mrg, (METRIC *)page->metric_id);
mi = aral_mallocz(ar_mi);
mi->metric = metric;
mi->uuid = mrg_metric_uuid(main_mrg, metric);
mi->first_time_s = page->start_time_s;
mi->last_time_s = page->end_time_s;
mi->number_of_pages = 1;
Expand All @@ -2530,6 +2533,7 @@ void pgc_open_cache_to_journal_v2(
else {
mi = *PValue;
mi->number_of_pages++;
mrg_metric_release(main_mrg, metric);
if(page->start_time_s < mi->first_time_s)
mi->first_time_s = page->start_time_s;
if(page->end_time_s > mi->last_time_s)
Expand All @@ -2542,7 +2546,7 @@ void pgc_open_cache_to_journal_v2(
(long)page->start_time_s, mi->JudyL_pages_by_start_time, PValue);

if(!*PValue) {
struct jv2_page_info *pi = aral_mallocz(ar_pi); // callocz(1, (sizeof(struct jv2_page_info)));
struct jv2_page_info *pi = aral_mallocz(ar_pi);
pi->start_time_s = page->start_time_s;
pi->end_time_s = page->end_time_s;
pi->update_every_s = page->update_every_s;
Expand Down Expand Up @@ -2605,6 +2609,7 @@ void pgc_open_cache_to_journal_v2(
}

JudyLFreeArray(&mi->JudyL_pages_by_start_time, PJE0);
mrg_metric_release(main_mrg, mi->metric);
aral_freez(ar_mi, mi);
}
JudyLFreeArray(&JudyL_metrics, PJE0);
Expand Down
3 changes: 2 additions & 1 deletion src/database/engine/rrdengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,11 @@ struct jv2_extents_info {

struct jv2_metrics_info {
nd_uuid_t *uuid;
void *metric;
uint32_t page_list_header;
uint32_t number_of_pages;
time_t first_time_s;
time_t last_time_s;
size_t number_of_pages;
Pvoid_t JudyL_pages_by_start_time;
};

Expand Down
Loading