aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-10-10 13:57:21 +0200
committerAlex Auvolat <alex@adnab.me>2023-10-10 13:57:21 +0200
commitd4932c31ea7d2430749ef5f37b9e47b36c1fafa8 (patch)
tree4dee7df1689c298a163798b47c524717d2872f7d
parent0c431b0c035f4de8ea9d1d9bd0b419bfc74ceabf (diff)
parente75fe2157d0973eb4320bbc87be5e54a1cb91a63 (diff)
downloadgarage-d4932c31ea7d2430749ef5f37b9e47b36c1fafa8.tar.gz
garage-d4932c31ea7d2430749ef5f37b9e47b36c1fafa8.zip
Merge branch 'main' into next
-rw-r--r--src/db/Cargo.toml5
-rw-r--r--src/garage/cli/convert_db.rs (renamed from src/db/bin/convert.rs)46
-rw-r--r--src/garage/cli/mod.rs2
-rw-r--r--src/garage/cli/structs.rs6
-rw-r--r--src/garage/main.rs3
5 files changed, 32 insertions, 30 deletions
diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml
index e479ed8f..b46a6c01 100644
--- a/src/db/Cargo.toml
+++ b/src/db/Cargo.toml
@@ -11,11 +11,6 @@ readme = "../../README.md"
[lib]
path = "lib.rs"
-[[bin]]
-name = "convert"
-path = "bin/convert.rs"
-required-features = ["cli"]
-
[dependencies]
err-derive = "0.3"
hexdump = "0.1"
diff --git a/src/db/bin/convert.rs b/src/garage/cli/convert_db.rs
index 957deedf..ffb5c44c 100644
--- a/src/db/bin/convert.rs
+++ b/src/garage/cli/convert_db.rs
@@ -1,39 +1,30 @@
use std::path::PathBuf;
-use garage_db::*;
+use structopt::StructOpt;
-use clap::Parser;
+use garage_db::*;
/// K2V command line interface
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct Args {
- /// Input DB path
- #[clap(short = 'i')]
+#[derive(StructOpt, Debug)]
+pub struct ConvertDbOpt {
+ /// Input database path (not the same as metadata_dir, see
+ /// https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#db-engine-since-v0-8-0)
+ #[structopt(short = "i")]
input_path: PathBuf,
- /// Input DB engine
- #[clap(short = 'a')]
+ /// Input database engine (sled, lmdb or sqlite; limited by db engines
+ /// enabled in this build)
+ #[structopt(short = "a")]
input_engine: String,
- /// Output DB path
- #[clap(short = 'o')]
+ /// Output database path
+ #[structopt(short = "o")]
output_path: PathBuf,
- /// Output DB engine
- #[clap(short = 'b')]
+ /// Output database engine
+ #[structopt(short = "b")]
output_engine: String,
}
-fn main() {
- let args = Args::parse();
- pretty_env_logger::init();
-
- match do_conversion(args) {
- Ok(()) => println!("Success!"),
- Err(e) => eprintln!("Error: {}", e),
- }
-}
-
-fn do_conversion(args: Args) -> Result<()> {
+pub(crate) fn do_conversion(args: ConvertDbOpt) -> Result<()> {
let input = open_db(args.input_path, args.input_engine)?;
let output = open_db(args.output_path, args.output_engine)?;
output.import(&input)?;
@@ -42,16 +33,19 @@ fn do_conversion(args: Args) -> Result<()> {
fn open_db(path: PathBuf, engine: String) -> Result<Db> {
match engine.as_str() {
+ #[cfg(feature = "sled")]
"sled" => {
let db = sled_adapter::sled::Config::default().path(&path).open()?;
Ok(sled_adapter::SledDb::init(db))
}
+ #[cfg(feature = "sqlite")]
"sqlite" | "sqlite3" | "rusqlite" => {
let db = sqlite_adapter::rusqlite::Connection::open(&path)?;
db.pragma_update(None, "journal_mode", &"WAL")?;
db.pragma_update(None, "synchronous", &"NORMAL")?;
Ok(sqlite_adapter::SqliteDb::init(db))
}
+ #[cfg(feature = "lmdb")]
"lmdb" | "heed" => {
std::fs::create_dir_all(&path).map_err(|e| {
Error(format!("Unable to create LMDB data directory: {}", e).into())
@@ -68,6 +62,8 @@ fn open_db(path: PathBuf, engine: String) -> Result<Db> {
let db = env_builder.open(&path)?;
Ok(lmdb_adapter::LmdbDb::init(db))
}
- e => Err(Error(format!("Invalid DB engine: {}", e).into())),
+ e => Err(Error(
+ format!("Invalid or unsupported DB engine: {}", e).into(),
+ )),
}
}
diff --git a/src/garage/cli/mod.rs b/src/garage/cli/mod.rs
index 17a2d8ce..e131f62c 100644
--- a/src/garage/cli/mod.rs
+++ b/src/garage/cli/mod.rs
@@ -4,6 +4,8 @@ pub(crate) mod layout;
pub(crate) mod structs;
pub(crate) mod util;
+pub(crate) mod convert_db;
+
pub(crate) use cmd::*;
pub(crate) use init::*;
pub(crate) use layout::*;
diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs
index 651df42e..aba57551 100644
--- a/src/garage/cli/structs.rs
+++ b/src/garage/cli/structs.rs
@@ -3,6 +3,8 @@ use structopt::StructOpt;
use garage_util::version::garage_version;
+use crate::cli::convert_db;
+
#[derive(StructOpt, Debug)]
pub enum Command {
/// Run Garage server
@@ -54,6 +56,10 @@ pub enum Command {
/// Low-level debug operations on data blocks
#[structopt(name = "block", version = garage_version())]
Block(BlockOperation),
+
+ /// Convert metadata db between database engine formats
+ #[structopt(name = "convert-db", version = garage_version())]
+ ConvertDb(convert_db::ConvertDbOpt),
}
#[derive(StructOpt, Debug)]
diff --git a/src/garage/main.rs b/src/garage/main.rs
index 3d07208c..66403d05 100644
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -176,6 +176,9 @@ async fn main() {
Command::OfflineRepair(repair_opt) => {
repair::offline::offline_repair(opt.config_file, opt.secrets, repair_opt).await
}
+ Command::ConvertDb(conv_opt) => {
+ cli::convert_db::do_conversion(conv_opt).map_err(From::from)
+ }
Command::Node(NodeOperation::NodeId(node_id_opt)) => {
node_id_command(opt.config_file, node_id_opt.quiet)
}