gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Friendlier error message for mapping failures (#12213)

Browse Source
This commit is contained in:
sakridge
2020-09-15 15:43:17 -07:00
committed by GitHub
parent 3fc7ea74c4
commit 3d4b9bb00d
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runtime/src/append_vec.rs
View File

@ -1,3 +1,4 @@
use log::*;
use memmap::MmapMut; use memmap::MmapMut;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use solana_sdk::{ use solana_sdk::{
@ -158,8 +159,14 @@ impl AppendVec {
data.flush().unwrap(); data.flush().unwrap();
//UNSAFE: Required to create a Mmap //UNSAFE: Required to create a Mmap
let map = unsafe { MmapMut::map_mut(&data) }; let map = unsafe { MmapMut::map_mut(&data) };
let map = let map = map.unwrap_or_else(|e| {
map.unwrap_or_else(|e| panic!("failed to map the data file (size: {}): {}", size, e)); error!(
"Failed to map the data file (size: {}): {}.\n
Please increase sysctl vm.max_map_count or equivalent for your platform.",
size, e
);
std::process::exit(1);
});
AppendVec { AppendVec {
path: file.to_path_buf(), path: file.to_path_buf(),
@ -174,7 +181,14 @@ impl AppendVec {
#[allow(clippy::mutex_atomic)] #[allow(clippy::mutex_atomic)]
pub(crate) fn new_empty_map(current_len: usize) -> Self { pub(crate) fn new_empty_map(current_len: usize) -> Self {
let map = MmapMut::map_anon(1).expect("failed to map the data file"); let map = MmapMut::map_anon(1).unwrap_or_else(|e| {
error!(
"Failed to create VM map for snapshot. {:?}\n
Please increase sysctl vm.max_map_count or equivalent for your platform.",
e
);
std::process::exit(1);
});
AppendVec { AppendVec {
path: PathBuf::from(String::default()), path: PathBuf::from(String::default()),
@ -483,7 +497,6 @@ pub mod tests {
use super::test_utils::*; use super::test_utils::*;
use super::*; use super::*;
use assert_matches::assert_matches; use assert_matches::assert_matches;
use log::*;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};
use solana_sdk::timing::duration_as_ms; use solana_sdk::timing::duration_as_ms;
use std::time::Instant; use std::time::Instant;