Skip to content
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.

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

Fix ensure_full_copy_of_bytes_is_made_test flaky test #528

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Changes from all commits
Commits
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
52 changes: 28 additions & 24 deletions nativelink-store/tests/memory_store_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,33 +85,37 @@ mod memory_store_tests {
// too low for some kernels/operating systems.
const MAXIMUM_MEMORY_USAGE_INCREASE_PERC: f64 = 1.3; // 30% increase.

let store_owned = MemoryStore::new(&nativelink_config::stores::MemoryStore::default());
let store = Pin::new(&store_owned);
let mut sum_memory_usage_increase_perc: f64 = 0.0;
const MAX_STATS_ITERATIONS: usize = 100;
for _ in 0..MAX_STATS_ITERATIONS {
let store_owned = MemoryStore::new(&nativelink_config::stores::MemoryStore::default());
let store = Pin::new(&store_owned);

let initial_virtual_mem = memory_stats().err_tip(|| "Failed to read memory.")?.physical_mem;
for (i, hash) in [VALID_HASH1, VALID_HASH2, VALID_HASH3, VALID_HASH4]
.into_iter()
.enumerate()
{
// User a variety of sizes increasing up to 10MB each iteration.
// We do this to reduce the chance of memory page size masking the potential bug.
let reserved_size = 10_usize.pow(u32::try_from(i).expect("Cast failed") + 4);
let mut mut_data = BytesMut::with_capacity(reserved_size);
mut_data.put_bytes(u8::try_from(i).expect("Cast failed"), 1);
let data = mut_data.freeze();

let digest = DigestInfo::try_new(hash, data.len())?;
store
.update_oneshot(digest, data)
.await
.err_tip(|| "Could not update store")?;
}

let initial_virtual_mem = memory_stats().err_tip(|| "Failed to read memory.")?.physical_mem;
for (i, hash) in [VALID_HASH1, VALID_HASH2, VALID_HASH3, VALID_HASH4]
.into_iter()
.enumerate()
{
// User a variety of sizes increasing up to 10MB each iteration.
// We do this to reduce the chance of memory page size masking the potential bug.
let reserved_size = 10_usize.pow(u32::try_from(i).expect("Cast failed") + 4);
let mut mut_data = BytesMut::with_capacity(reserved_size);
mut_data.put_bytes(u8::try_from(i).expect("Cast failed"), 1);
let data = mut_data.freeze();

let digest = DigestInfo::try_new(hash, data.len())?;
store
.update_oneshot(digest, data)
.await
.err_tip(|| "Could not update store")?;
let new_virtual_mem = memory_stats().err_tip(|| "Failed to read memory.")?.physical_mem;
sum_memory_usage_increase_perc += new_virtual_mem as f64 / initial_virtual_mem as f64;
}

let new_virtual_mem = memory_stats().err_tip(|| "Failed to read memory.")?.physical_mem;
let memory_usage_increase_perc = new_virtual_mem as f64 / initial_virtual_mem as f64;
assert!(
memory_usage_increase_perc < MAXIMUM_MEMORY_USAGE_INCREASE_PERC,
"Memory usage increased by {memory_usage_increase_perc} perc, which is more than {MAXIMUM_MEMORY_USAGE_INCREASE_PERC} perc",
(sum_memory_usage_increase_perc / MAX_STATS_ITERATIONS as f64) < MAXIMUM_MEMORY_USAGE_INCREASE_PERC,
"Memory usage increased by {sum_memory_usage_increase_perc} perc, which is more than {MAXIMUM_MEMORY_USAGE_INCREASE_PERC} perc",
);
Ok(())
}
Expand Down
Loading