rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-14 03:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

use BTreeMap::retain

Browse Source 
Signed-off-by: Yuchen Liang <yuchen@neon.tech>
This commit is contained in:
Yuchen Liang
2024-06-13 12:59:05 -04:00
parent daffd5b998
commit da55eebc83
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pageserver/src/tenant.rs
View File

@@ -21,6 +21,7 @@ use futures::FutureExt;
use futures::StreamExt;
use pageserver_api::models;
use pageserver_api::models::AuxFilePolicy;
use pageserver_api::models::LsnLease;
use pageserver_api::models::TimelineState;
use pageserver_api::models::TopTenantShardItem;
use pageserver_api::models::WalRedoManagerStatus;
@@ -3007,27 +3008,9 @@ impl Tenant {
{
let mut target = timeline.gc_info.write().unwrap();
// FIXME(yuchen): Maybe we can move this before taking `gc_cs`?
{
// Collect expired leases
let lsns_with_expired_lease = target
.leases
.iter()
.filter_map(
|(lsn, lease)| {
if lease.is_expired() {
Some(*lsn)
} else {
None
}
},
)
.collect::<Vec<_>>();
for lsn in lsns_with_expired_lease {
target.leases.remove(&lsn);
}
}
target
.leases
.retain(|_, lease| !LsnLease::is_expired(lease));
match gc_cutoffs.remove(&timeline.timeline_id) {
Some(cutoffs) => {