这是indexloc提供的服务，不要输入任何密码
Skip to content

[Storage][Pruner] Set min_readable_version and metrics. #10381

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
merged 1 commit into from
Oct 4, 2023
Merged

[Storage][Pruner] Set min_readable_version and metrics. #10381

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
5 changes: 5 additions & 0 deletions storage/aptosdb/src/pruner/ledger_pruner/ledger_pruner_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ impl LedgerPrunerManager {
let min_readable_version = latest_version.saturating_sub(self.prune_window);
self.min_readable_version
.store(min_readable_version, Ordering::SeqCst);

PRUNER_VERSIONS
.with_label_values(&["ledger_pruner", "min_readable"])
.set(min_readable_version as i64);

self.pruner_worker
.as_ref()
.unwrap()
Expand Down
5 changes: 5 additions & 0 deletions storage/aptosdb/src/pruner/state_kv_pruner/state_kv_pruner_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ impl StateKvPrunerManager {
let min_readable_version = latest_version.saturating_sub(self.prune_window);
self.min_readable_version
.store(min_readable_version, Ordering::SeqCst);

PRUNER_VERSIONS
.with_label_values(&["state_kv_pruner", "min_readable"])
.set(min_readable_version as i64);

self.pruner_worker
.as_ref()
.unwrap()
Expand Down
15 changes: 12 additions & 3 deletions storage/aptosdb/src/pruner/state_merkle_pruner/state_merkle_pruner_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ where

/// Sets pruner target version when necessary.
fn maybe_set_pruner_target_db_version(&self, latest_version: Version) {
// Always wake up the state pruner.
if self.is_pruner_enabled() {
let min_readable_version = self.get_min_readable_version();
if self.is_pruner_enabled() && latest_version >= min_readable_version + self.prune_window {
self.set_pruner_target_db_version(latest_version);
}
}
Expand Down Expand Up @@ -158,9 +158,18 @@ where

fn set_pruner_target_db_version(&self, latest_version: Version) {
assert!(self.pruner_worker.is_some());

let min_readable_version = latest_version.saturating_sub(self.prune_window);
self.min_readable_version
.store(min_readable_version, Ordering::SeqCst);

PRUNER_VERSIONS
.with_label_values(&[S::name(), "min_readable"])
.set(min_readable_version as i64);

self.pruner_worker
.as_ref()
.unwrap()
.set_target_db_version(latest_version.saturating_sub(self.prune_window));
.set_target_db_version(min_readable_version);
}
}