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.

Sign up for GitHub

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

Jump to bottom

Use readable errno descriptions for lmdb errors #5604

Merged
merged 1 commit into from
Mar 15, 2018
Merged

Use readable errno descriptions for lmdb errors #5604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions src/rust/engine/fs/src/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ mod local {
Err(NotFound) => {}
Err(err) => {
return Err(format!(
"Error reading from store when determining type of fingerprint {}: {:?}",
"Error reading from store when determining type of fingerprint {}: {}",
fingerprint, err
))
}
Expand All @@ -495,13 +495,13 @@ mod local {
let (env, file_database, _) = self.inner.file_dbs.get(fingerprint);
let txn = env
.begin_ro_txn()
.map_err(|err| format!("Failed to begin read transaction: {:?}", err))?;
.map_err(|err| format!("Failed to begin read transaction: {}", err))?;
match txn.get(file_database, &fingerprint.as_ref()) {
Ok(_) => return Ok(Some(EntryType::File)),
Err(NotFound) => {}
Err(err) => {
return Err(format!(
"Error reading from store when determining type of fingerprint {}: {:?}",
"Error reading from store when determining type of fingerprint {}: {}",
fingerprint, err
))
}
Expand All @@ -519,7 +519,7 @@ mod local {
env
.begin_rw_txn()
.and_then(|mut txn| self.lease(&lease_database, &digest.0, until, &mut txn))
.map_err(|err| format!("Error leasing digest {:?}: {:?}", digest, err))?;
.map_err(|err| format!("Error leasing digest {:?}: {}", digest, err))?;
}
Ok(())
}
Expand Down Expand Up @@ -595,7 +595,7 @@ mod local {
used_bytes -= aged_fingerprint.size_bytes;
txn.commit()
})
.map_err(|err| format!("Error garbage collecting: {:?}", err))?;
.map_err(|err| format!("Error garbage collecting: {}", err))?;
}
}
Ok(used_bytes)
Expand All @@ -615,10 +615,10 @@ mod local {
for &(ref env, ref database, ref lease_database) in database.all_lmdbs().iter() {
let txn = env
.begin_ro_txn()
.map_err(|err| format!("Error beginning transaction to garbage collect: {:?}", err))?;
.map_err(|err| format!("Error beginning transaction to garbage collect: {}", err))?;
let mut cursor = txn
.open_ro_cursor(*database)
.map_err(|err| format!("Failed to open lmdb read cursor: {:?}", err))?;
.map_err(|err| format!("Failed to open lmdb read cursor: {}", err))?;
for (key, bytes) in cursor.iter() {
*used_bytes = *used_bytes + bytes.len();

Expand Down Expand Up @@ -694,7 +694,7 @@ mod local {
Ok(()) => Ok(fingerprint),
Err(KeyExist) => Ok(fingerprint),
Err(err) => Err(format!(
"Error storing fingerprint {}: {:?}",
"Error storing fingerprint {}: {}",
fingerprint, err
)),
}
Expand All @@ -720,12 +720,12 @@ mod local {
let (env, db, _) = dbs.get(&fingerprint);
let ro_txn = env
.begin_ro_txn()
.map_err(|err| format!("Failed to begin read transaction: {:?}", err));
.map_err(|err| format!("Failed to begin read transaction: {}", err));
ro_txn.and_then(|txn| match txn.get(db, &fingerprint) {
Ok(bytes) => Ok(Some(f(Bytes::from(bytes)))),
Err(NotFound) => Ok(None),
Err(err) => Err(format!(
"Error loading fingerprint {}: {:?}",
"Error loading fingerprint {}: {}",
fingerprint, err,
)),
})
Expand Down Expand Up @@ -797,14 +797,14 @@ mod local {
.set_max_dbs(2)
.set_map_size(MAX_LOCAL_STORE_SIZE_BYTES / 16)
.open(&dir)
.map_err(|e| format!("Error making env for store at {:?}: {:?} for ", dir, e))?;
.map_err(|e| format!("Error making env for store at {:?}: {}", dir, e))?;

debug!("Making ShardedLmdb content database for {:?}", dir);
let content_database = env
.create_db(Some("content"), DatabaseFlags::empty())
.map_err(|e| {
format!(
"Error creating/opening content database at {:?}: {:?}",
"Error creating/opening content database at {:?}: {}",
dir, e
)
})?;
Expand All @@ -814,7 +814,7 @@ mod local {
.create_db(Some("leases"), DatabaseFlags::empty())
.map_err(|e| {
format!(
"Error creating/opening content database at {:?}: {:?}",
"Error creating/opening content database at {:?}: {}",
dir, e
)
})?;
Expand Down