change: metric data save in data-layer #185
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…TCLab-Inc/wave-autoscale into 183-metric-data-save-in-memory
pueding
requested changes
Oct 31, 2023
core/data-layer/src/data_layer.rs
Outdated
Comment on lines
769
to
783
| loop { | ||
| // check size :: buffersize - total size < 0 (None) => remove target data | ||
| if metric_buffer_size_kb | ||
| .checked_sub(subtract_total_size as u64) | ||
| .is_none() | ||
| { | ||
| let Some(front_source_metrics_metadata) = source_metrics_metadata.pop_front() else { | ||
| break; | ||
| }; | ||
| subtract_total_size -= front_source_metrics_metadata.2; // oldest metadata size | ||
| remove_target_data.append(&mut vec![front_source_metrics_metadata]); | ||
| continue; | ||
| } | ||
| break; | ||
| } |
There was a problem hiding this comment.
Suggested change
| loop { | |
| // check size :: buffersize - total size < 0 (None) => remove target data | |
| if metric_buffer_size_kb | |
| .checked_sub(subtract_total_size as u64) | |
| .is_none() | |
| { | |
| let Some(front_source_metrics_metadata) = source_metrics_metadata.pop_front() else { | |
| break; | |
| }; | |
| subtract_total_size -= front_source_metrics_metadata.2; // oldest metadata size | |
| remove_target_data.append(&mut vec![front_source_metrics_metadata]); | |
| continue; | |
| } | |
| break; | |
| } | |
| loop { | |
| // check size :: buffersize - total size < 0 (None) => remove target data | |
| if metric_buffer_size_kb | |
| .checked_sub(subtract_total_size as u64) | |
| .is_some() { | |
| break; | |
| } | |
| let Some(front_source_metrics_metadata) = source_metrics_metadata.pop_front() else { | |
| break; | |
| }; | |
| subtract_total_size -= front_source_metrics_metadata.2; // oldest metadata size | |
| remove_target_data.append(&mut vec![front_source_metrics_metadata]); | |
| } |
core/data-layer/src/data_layer.rs
Outdated
| remove_target_data | ||
| .iter() | ||
| .for_each(|(metric_id, ulid, size)| { | ||
| let Some(metric_id_data) = source_metrics.get_mut(metric_id) else { |
There was a problem hiding this comment.
Suggested change
| let Some(metric_id_data) = source_metrics.get_mut(metric_id) else { | |
| let Some(source_metrics_map) = source_metrics.get_mut(metric_id) else { |
to match variable names as shown below (source_metrics_map)
pueding
reviewed
Oct 31, 2023
pueding
requested changes
Nov 2, 2023
core/data-layer/src/data_layer.rs
Outdated
| let source_metrics_data = SOURCE_METRICS_DATA.clone(); | ||
| let Ok(mut source_metrics_data) = source_metrics_data.write() else { | ||
| error!("[DataLayer::new()] Failed to get the lock of source_metrics_data and try to create a new one"); | ||
| return DataLayer { |
There was a problem hiding this comment.
I think we should do panic here because it cannot get the static variable
core/data-layer/src/data_layer.rs
Outdated
| }; | ||
| subtract_total_size -= front_source_metrics_metadata.2; // oldest metadata size | ||
| remove_target_data.append(&mut vec![front_source_metrics_metadata]); | ||
| continue; |
Comment on lines
159
to
164
| let _ = ctx.globals().set( | ||
| "get", | ||
| rquickjs::prelude::Func::new("get", move |args: rquickjs::Object| -> Result<f64, rquickjs::Error> { | ||
| let metric_id = args.get::<String, String>("metric_id".to_string()).map_err(|_| rquickjs::Error::Exception)?; | ||
| let name = args.get::<String, String>("name".to_string()).map_err(|_| rquickjs::Error::Exception)?; | ||
| let tags = args.get::<String, HashMap<String, String>>("tags".to_string()); | ||
| let tags = match tags { | ||
| Ok(tags) => tags, | ||
| Err(_) => HashMap::new() | ||
| }; | ||
| let stats = args.get::<String, String>("stats".to_string()).map_err(|_| rquickjs::Error::Exception)?; | ||
| let period_sec = args.get::<String, u64>("period_sec".to_string()).map_err(|_| rquickjs::Error::Exception)?; | ||
| context_global_get_func(metric_id, name, tags, stats, period_sec, metric_ids_values.clone()) | ||
| get_in_js(args) | ||
| }), | ||
| ); |
There was a problem hiding this comment.
we do not need to have the closure function move |args: .....
pueding
approved these changes
Nov 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Types of changes
What this PR does / why we need it:
Metric data save in memory (daya-layer)
Which issue/s this PR fixes
fixes #183
How Has This Been Tested?
Checklist: