Prepare for v0.3.0 and add migration path from v0.2.1.x

Cargo.lock

@@ -350,16 +350,16 @@ dependencies = [
 
 [[package]]
 name = "garage"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "futures",
  "futures-util",
  "garage_api",
  "garage_model",
- "garage_rpc",
+ "garage_rpc 0.3.0",
  "garage_table",
- "garage_util",
+ "garage_util 0.3.0",
  "garage_web",
  "git-version",
  "hex",
@@ -376,7 +376,7 @@ dependencies = [
 
 [[package]]
 name = "garage_api"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "base64",
  "bytes",
@@ -387,7 +387,7 @@ dependencies = [
  "futures-util",
  "garage_model",
  "garage_table",
- "garage_util",
+ "garage_util 0.3.0",
  "hex",
  "hmac",
  "http",
@@ -407,14 +407,14 @@ dependencies = [
 
 [[package]]
 name = "garage_model"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "arc-swap",
  "futures",
  "futures-util",
- "garage_rpc",
+ "garage_rpc 0.3.0",
  "garage_table",
- "garage_util",
+ "garage_util 0.3.0",
  "hex",
  "log",
  "rand",
@@ -428,12 +428,40 @@ dependencies = [
 [[package]]
 name = "garage_rpc"
 version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c182633cebe4abed9594afb14770fc45402513765d38a4b19659ae0ccb2a2f"
 dependencies = [
  "arc-swap",
  "bytes",
  "futures",
  "futures-util",
- "garage_util",
+ "garage_util 0.2.1",
+ "gethostname",
+ "hex",
+ "http",
+ "hyper",
+ "hyper-rustls",
+ "log",
+ "rmp-serde",
+ "rustls",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-rustls",
+ "tokio-stream",
+ "webpki",
+]
+
+[[package]]
+name = "garage_rpc"
+version = "0.3.0"
+dependencies = [
+ "arc-swap",
+ "bytes",
+ "futures",
+ "futures-util",
+ "garage_rpc 0.2.1",
+ "garage_util 0.3.0",
  "gethostname",
  "hex",
  "http",
@@ -452,13 +480,13 @@ dependencies = [
 
 [[package]]
 name = "garage_table"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "bytes",
  "futures",
  "futures-util",
- "garage_rpc",
+ "garage_rpc 0.3.0",
- "garage_util",
+ "garage_util 0.3.0",
  "hexdump",
  "log",
  "rand",
@@ -472,6 +500,33 @@ dependencies = [
 [[package]]
 name = "garage_util"
 version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aef76d3779e406a16fdcaffe8d86b8ae2943a549d2b33f2c20930838764464c0"
+dependencies = [
+ "blake2",
+ "chrono",
+ "err-derive",
+ "futures",
+ "hex",
+ "http",
+ "hyper",
+ "log",
+ "rand",
+ "rmp-serde",
+ "rustls",
+ "serde",
+ "serde_json",
+ "sha2",
+ "sled",
+ "tokio",
+ "toml",
+ "webpki",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "garage_util"
+version = "0.3.0"
 dependencies = [
  "blake2",
  "chrono",
@@ -496,14 +551,14 @@ dependencies = [
 
 [[package]]
 name = "garage_web"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "err-derive",
  "futures",
  "garage_api",
  "garage_model",
  "garage_table",
- "garage_util",
+ "garage_util 0.3.0",
  "http",
  "hyper",
  "idna",

Makefile

@@ -1,20 +1,5 @@
-BIN=target/release/garage
-DOCKER=lxpz/garage_amd64
-
 all:
 	clear; cargo build
 
-$(BIN):
+release:
 	RUSTFLAGS="-C link-arg=-fuse-ld=lld -C target-cpu=x86-64 -C target-feature=+sse2" cargo build --release --no-default-features
-
-$(BIN).stripped: $(BIN)
-	cp $^ $@
-	strip $@
-
-docker: $(BIN).stripped
-	docker pull archlinux:latest
-	docker build -t $(DOCKER):$(TAG) .
-	docker push $(DOCKER):$(TAG)
-	docker tag $(DOCKER):$(TAG) $(DOCKER):latest
-	docker push $(DOCKER):latest
-	

config.dev.toml

@@ -1,22 +0,0 @@
-block_size = 1048576			# objects are split in blocks of maximum this number of bytes
-
-metadata_dir = "/tmp/garage-meta"
-data_dir = "/tmp/garage-data"
-
-rpc_bind_addr = "[::]:3901"		# the port other Garage nodes will use to talk to this node
-
-bootstrap_peers = []
-
-max_concurrent_rpc_requests = 12
-data_replication_factor = 3
-meta_replication_factor = 3
-meta_epidemic_fanout = 3
-
-[s3_api]
-api_bind_addr = "[::1]:3900"	# the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part.
-s3_region = "garage"				# set this to anything. S3 API calls will fail if they are not made against the region set here.
-
-[s3_web]
-bind_addr = "[::1]:3902"
-root_domain = ".garage.tld"
-index = "index.html"

make_docker.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+BIN=target/release/garage
+DOCKER=lxpz/garage_amd64
+
+TAG=$1
+if [ -z "$1" ]; then
+	echo "Usage: $0 <tag>"
+	exit 1
+fi
+
+RUSTFLAGS="-C link-arg=-fuse-ld=lld -C target-cpu=x86-64 -C target-feature=+sse2" cargo build --release --no-default-features
+cp $BIN $BIN.stripped
+strip $BIN.stripped
+
+docker pull archlinux:latest
+docker build -t $DOCKER:$TAG .
+docker push $DOCKER:$TAG
+docker tag $DOCKER:$TAG $DOCKER:latest
+docker push $DOCKER:latest

src/api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_api"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,9 +13,9 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_model = { version = "0.2.1", path = "../model" }
+garage_model = { version = "0.3.0", path = "../model" }
-garage_table = { version = "0.2.1", path = "../table" }
+garage_table = { version = "0.3.0", path = "../table" }
-garage_util = { version = "0.2.1", path = "../util" }
+garage_util = { version = "0.3.0", path = "../util" }
 
 base64 = "0.13"
 bytes = "1.0"

src/garage/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -14,12 +14,12 @@ path = "main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_api = { version = "0.2.1", path = "../api" }
+garage_api = { version = "0.3.0", path = "../api" }
-garage_model = { version = "0.2.1", path = "../model" }
+garage_model = { version = "0.3.0", path = "../model" }
-garage_rpc = { version = "0.2.1", path = "../rpc" }
+garage_rpc = { version = "0.3.0", path = "../rpc" }
-garage_table = { version = "0.2.1", path = "../table" }
+garage_table = { version = "0.3.0", path = "../table" }
-garage_util = { version = "0.2.1", path = "../util" }
+garage_util = { version = "0.3.0", path = "../util" }
-garage_web = { version = "0.2.1", path = "../web" }
+garage_web = { version = "0.3.0", path = "../web" }
 
 bytes = "1.0"
 git-version = "0.3.4"

src/garage/cli.rs

@@ -467,9 +467,7 @@ pub async fn cmd_configure(
 						"Please specify a capacity with the -c flag, or set node explicitly as gateway with -g".into())),
 			};
 			NetworkConfigEntry {
-				zone: args
+				zone: args.zone.expect("Please specifiy a zone with the -z flag"),
-					.zone
-					.expect("Please specifiy a zone with the -z flag"),
 				capacity,
 				tag: args.tag.unwrap_or_default(),
 			}
@@ -481,9 +479,7 @@ pub async fn cmd_configure(
 				_ => old.capacity,
 			};
 			NetworkConfigEntry {
-				zone: args
+				zone: args.zone.unwrap_or_else(|| old.zone.to_string()),
-					.zone
-					.unwrap_or_else(|| old.zone.to_string()),
 				capacity,
 				tag: args.tag.unwrap_or_else(|| old.tag.to_string()),
 			}

src/model/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_model"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,9 +13,9 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_rpc = { version = "0.2.1", path = "../rpc" }
+garage_rpc = { version = "0.3.0", path = "../rpc" }
-garage_table = { version = "0.2.1", path = "../table" }
+garage_table = { version = "0.3.0", path = "../table" }
-garage_util = { version = "0.2.1", path = "../util" }
+garage_util = { version = "0.3.0", path = "../util" }
 
 arc-swap = "1.0"
 hex = "0.4"

src/rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_rpc"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,7 +13,9 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_util = { version = "0.2.1", path = "../util" }
+garage_util = { version = "0.3.0", path = "../util" }
+
+garage_rpc_021 = { package = "garage_rpc", version = "0.2.1" }
 
 arc-swap = "1.0"
 bytes = "1.0"

src/rpc/membership.rs

@@ -240,11 +240,21 @@ impl System {
 		let net_config = match persist_config.load() {
 			Ok(x) => x,
 			Err(e) => {
-				info!(
+				match Persister::<garage_rpc_021::ring::NetworkConfig>::new(
-					"No valid previous network configuration stored ({}), starting fresh.",
+					&metadata_dir,
-					e
+					"network_config",
-				);
+				)
-				NetworkConfig::new()
+				.load()
+				{
+					Ok(old_config) => NetworkConfig::migrate_from_021(old_config),
+					Err(e2) => {
+						info!(
+							"No valid previous network configuration stored ({}, {}), starting fresh.",
+							e, e2
+						);
+						NetworkConfig::new()
+					}
+				}
 			}
 		};
 

src/rpc/ring.rs

@@ -38,6 +38,31 @@ impl NetworkConfig {
 			version: 0,
 		}
 	}
+
+	pub(crate) fn migrate_from_021(old: garage_rpc_021::ring::NetworkConfig) -> Self {
+		let members = old
+			.members
+			.into_iter()
+			.map(|(id, conf)| {
+				(
+					Hash::try_from(id.as_slice()).unwrap(),
+					NetworkConfigEntry {
+						zone: conf.datacenter,
+						capacity: if conf.capacity == 0 {
+							None
+						} else {
+							Some(conf.capacity)
+						},
+						tag: conf.tag,
+					},
+				)
+			})
+			.collect();
+		Self {
+			members,
+			version: old.version,
+		}
+	}
 }
 
 /// The overall configuration of one (possibly remote) node
@@ -178,8 +203,7 @@ impl Ring {
 								.iter()
 								.map(|(_id, info)| info.zone.as_str())
 								.collect::<HashSet<&str>>();
-							if (p_zns.len() < n_zones
+							if (p_zns.len() < n_zones && !p_zns.contains(&node_info.zone.as_str()))
-								&& !p_zns.contains(&node_info.zone.as_str()))
 								|| (p_zns.len() == n_zones
 									&& !partitions[qv].iter().any(|(id, _i)| id == node_id))
 							{

src/table/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_table"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,8 +13,8 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_rpc = { version = "0.2.1", path = "../rpc" }
+garage_rpc = { version = "0.3.0", path = "../rpc" }
-garage_util = { version = "0.2.1", path = "../util" }
+garage_util = { version = "0.3.0", path = "../util" }
 
 bytes = "1.0"
 hexdump = "0.1"

src/util/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_util"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"

src/web/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "garage_web"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -13,10 +13,10 @@ path = "lib.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-garage_api = { version = "0.2.1", path = "../api" }
+garage_api = { version = "0.3.0", path = "../api" }
-garage_model = { version = "0.2.1", path = "../model" }
+garage_model = { version = "0.3.0", path = "../model" }
-garage_util = { version = "0.2.1", path = "../util" }
+garage_util = { version = "0.3.0", path = "../util" }
-garage_table = { version = "0.2.1", path = "../table" }
+garage_table = { version = "0.3.0", path = "../table" }
 
 err-derive = "0.3"
 idna = "0.2"