Skip to content

Commit

Permalink
Abort if the open fd limit cannot be increased (#10064)
Browse files Browse the repository at this point in the history
automerge

(cherry picked from commit 7080fb9)

# Conflicts:
#	ledger/src/blockstore_db.rs
  • Loading branch information
mvines authored and mergify-bot committed May 15, 2020
1 parent 8651f05 commit 3349251
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
10 changes: 7 additions & 3 deletions ledger/src/blockstore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl Blockstore {
fs::create_dir_all(&ledger_path)?;
let blockstore_path = ledger_path.join(BLOCKSTORE_DIRECTORY);

adjust_ulimit_nofile();
adjust_ulimit_nofile()?;

// Open the database
let mut measure = Measure::start("open");
Expand Down Expand Up @@ -2809,10 +2809,12 @@ pub fn make_chaining_slot_entries(
}

#[cfg(not(unix))]
fn adjust_ulimit_nofile() {}
fn adjust_ulimit_nofile() -> Result<()> {
Ok(())
}

#[cfg(unix)]
fn adjust_ulimit_nofile() {
fn adjust_ulimit_nofile() -> Result<()> {
// Rocks DB likes to have many open files. The default open file descriptor limit is
// usually not enough
let desired_nofile = 65000;
Expand Down Expand Up @@ -2840,11 +2842,13 @@ fn adjust_ulimit_nofile() {
if cfg!(target_os = "macos") {
error!("On mac OS you may need to run |sudo launchctl limit maxfiles 65536 200000| first");
}
return Err(BlockstoreError::UnableToSetOpenFileDescriptorLimit);
}

nofile = get_nofile();
}
info!("Maximum open file descriptors: {}", nofile.rlim_cur);
Ok(())
}

#[cfg(test)]
Expand Down
5 changes: 5 additions & 0 deletions ledger/src/blockstore_db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ pub enum BlockstoreError {
Serialize(#[from] Box<bincode::ErrorKind>),
FsExtraError(#[from] fs_extra::error::Error),
SlotCleanedUp,
<<<<<<< HEAD
=======
UnpackError(#[from] UnpackError),
UnableToSetOpenFileDescriptorLimit,
>>>>>>> 7080fb9b3... Abort if the open fd limit cannot be increased (#10064)
}
pub type Result<T> = std::result::Result<T, BlockstoreError>;

Expand Down

0 comments on commit 3349251

Please sign in to comment.