Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Do not put sled in garage's cargo.toml
Some checks reported errors
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone/pr Build was killed
Details

Browse source
This commit is contained in:
Alex 2022-06-02 17:01:04 +02:00
parent 9f0f5b2e37
commit 6805e184e9
Signed by: lx
GPG key ID: 0E496D15096376BE
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -912,7 +912,6 @@ dependencies = [
"serde_bytes",
"serde_json",
"sha2",
"sled",
"static_init",
"structopt",
"tokio",

2
src/db/sled_adapter.rs
View file

@ -12,6 +12,8 @@ use sled::transaction::{
use crate::{Db, Error, IDb, ITx, ITxFn, Result, TxError, TxFnResult, TxResult, Value, ValueIter};
pub use sled;
impl From<sled::Error> for Error {
fn from(e: sled::Error) -> Error {
Error(format!("{}", e).into())

2
src/garage/Cargo.toml
View file

@ -37,8 +37,6 @@ rand = "0.8"
async-trait = "0.1.7"
sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" }
sled = "0.34"
rmp-serde = "0.15"
serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
serde_bytes = "0.11"

6
src/garage/server.rs
View file

@ -2,6 +2,8 @@ use std::path::PathBuf;
use tokio::sync::watch;
use garage_db as db;
use garage_util::background::*;
use garage_util::config::*;
use garage_util::error::Error;
@ -32,13 +34,13 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
info!("Opening database...");
let mut db_path = config.metadata_dir.clone();
db_path.push("db");
let db = sled::Config::default()
let db = db::sled_adapter::sled::Config::default()
.path(&db_path)
.cache_capacity(config.sled_cache_capacity)
.flush_every_ms(Some(config.sled_flush_every_ms))
.open()
.expect("Unable to open sled DB");
let db = garage_db::sled_adapter::SledDb::new(db);
let db = db::sled_adapter::SledDb::new(db);
info!("Initializing background runner...");
let watch_cancel = netapp::util::watch_ctrl_c();