Skip to content

Commit

Permalink
More explicit information about how much garbaged is in the slotmap (#…
Browse files Browse the repository at this point in the history 
…266)
  • Loading branch information
@Byron
Byron committed Dec 19, 2021
1 parent 9474a43 commit cfd36ee
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 41 deletions.
17 changes: 13 additions & 4 deletions git-odb/src/store_impls/dynamic/metrics.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ impl super::Store {
let mut known_packs = 0;
let mut known_indices = 0;
let mut unused_slots = 0;
let mut unreachable_indices = 0;

let index = self.index.load();
for f in index.slot_indices.iter().map(|idx| &self.files[*idx]) {
Expand Down Expand Up @@ -43,21 +44,29 @@ impl super::Store {
}

for slot in &self.files {
if slot.files.load().is_none() {
unused_slots += 1;
match slot.files.load().as_ref() {
None => {
unused_slots += 1;
}
Some(bundle) => {
if bundle.is_disposable() {
unreachable_indices += 1;
}
}
}
}

types::Metrics {
num_handles: self.num_handles_unstable.load(Ordering::Relaxed)
+ self.num_handles_stable.load(Ordering::Relaxed),
num_refreshes: self.num_disk_state_consolidation.load(Ordering::Relaxed),
open_packs,
open_indices,
open_reachable_packs: open_packs,
open_reachable_indices: open_indices,
known_indices,
known_packs,
unused_slots,
loose_dbs: index.loose_dbs.len(),
unreachable_indices,
}
}
}
5 changes: 3 additions & 2 deletions git-odb/src/store_impls/dynamic/types.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,12 @@ pub(crate) struct MutableIndexAndPack {
pub struct Metrics {
pub num_handles: usize,
pub num_refreshes: usize,
pub open_indices: usize,
pub open_reachable_indices: usize,
pub known_indices: usize,
pub open_packs: usize,
pub open_reachable_packs: usize,
pub known_packs: usize,
pub unused_slots: usize,
pub unreachable_indices: usize,
pub loose_dbs: usize,
}

Expand Down
107 changes: 72 additions & 35 deletions git-odb/tests/odb/store/dynamic.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ fn contains() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 1,
open_indices: 0,
open_reachable_indices: 0,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"it only refreshed the file list, yielding the loose db to find this object, but no pack was opened yet"
);
Expand All @@ -49,12 +50,13 @@ fn contains() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 1,
open_indices: 1,
open_reachable_indices: 1,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"it loaded the biggest back only, which is the first in the list"
);
Expand All @@ -69,12 +71,13 @@ fn contains() {
git_odb::store::Metrics {
num_handles: 2,
num_refreshes: 1,
open_indices: 3,
open_reachable_indices: 3,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"when asking for an object in the smallest pack, all inbetween packs are also loaded."
);
Expand All @@ -85,12 +88,13 @@ fn contains() {
git_odb::store::Metrics {
num_handles: 2,
num_refreshes: 2,
open_indices: 3,
open_reachable_indices: 3,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"trigger refreshes each time there is an object miss"
);
Expand All @@ -102,12 +106,13 @@ fn contains() {
git_odb::store::Metrics {
num_handles: 2,
num_refreshes: 2,
open_indices: 3,
open_reachable_indices: 3,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"if no refreshes are allowed, there is no additional refresh"
);
Expand All @@ -128,12 +133,13 @@ fn lookup() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 0,
open_indices: 0,
open_reachable_indices: 0,
known_indices: 0,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 0,
unused_slots: 32,
loose_dbs: 0
loose_dbs: 0,
unreachable_indices: 0
},
"nothing happened yet, the store is totally lazy"
);
Expand All @@ -146,12 +152,13 @@ fn lookup() {
let mut all_loaded = git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 1,
open_indices: 3,
open_reachable_indices: 3,
known_indices: 3,
open_packs: 3,
open_reachable_packs: 3,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1,
unreachable_indices: 0,
};
assert_eq!(
handle.inner.store().metrics(),
Expand Down Expand Up @@ -195,12 +202,13 @@ fn missing_objects_triggers_everything_is_loaded() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 2,
open_indices: 3,
open_reachable_indices: 3,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"first refresh triggered by on-disk check, second refresh triggered to see if something changed, contains() only sees indices"
);
Expand All @@ -215,12 +223,13 @@ fn missing_objects_triggers_everything_is_loaded() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 3,
open_indices: 3,
open_reachable_indices: 3,
known_indices: 3,
open_packs: 0,
open_reachable_packs: 0,
known_packs: 3,
unused_slots: 29,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"there are still no packs opened as no index contained the object"
);
Expand Down Expand Up @@ -284,12 +293,13 @@ fn auto_refresh_with_and_without_id_stability() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 1,
open_indices: 1,
open_reachable_indices: 1,
known_indices: 1,
open_packs: 1,
open_reachable_packs: 1,
known_packs: 1,
unused_slots: 31,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"one pack was opened"
);
Expand All @@ -307,12 +317,13 @@ fn auto_refresh_with_and_without_id_stability() {
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 2,
open_indices: 1,
open_reachable_indices: 1,
known_indices: 1,
open_packs: 1,
open_reachable_packs: 1,
known_packs: 1,
unused_slots: 31,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 0
},
"the old pack was removed, the new was loaded"
);
Expand Down Expand Up @@ -343,12 +354,13 @@ fn auto_refresh_with_and_without_id_stability() {
git_odb::store::Metrics {
num_handles: 2,
num_refreshes: 3,
open_indices: 1,
open_reachable_indices: 1,
known_indices: 1,
open_packs: 1,
open_reachable_packs: 1,
known_packs: 1,
unused_slots: 30,
loose_dbs: 1
loose_dbs: 1,
unreachable_indices: 1
},
"the removed pack is still loaded"
);
Expand All @@ -361,4 +373,29 @@ fn auto_refresh_with_and_without_id_stability() {
"handles without any internal cache also work"
);
}

hide_pack("pack-a2bf8e71d8c18879e499335762dd95119d93d9f1");
unhide_pack("pack-c0438c19fb16422b6bbcce24387b3264416d485b");

assert!(
handle
.find(hex_to_id("dd25c539efbb0ab018caa4cda2d133285634e9b5"), &mut buf)
.is_ok(),
"new pack is loaded, previously loaded is forgotten, lack of cache triggers refresh"
);
assert_eq!(
handle.inner.store().metrics(),
git_odb::store::Metrics {
num_handles: 1,
num_refreshes: 4,
open_reachable_indices: 1,
known_indices: 1,
open_reachable_packs: 1,
known_packs: 1,
unused_slots: 30,
loose_dbs: 1,
unreachable_indices: 1
},
"garbaged slots aren't reclaimed until there is the need. Keeping indices open despite them not being accessible anymore."
);
}

0 comments on commit cfd36ee

Please sign in to comment.