aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-11-08 15:13:37 +0100
committerAlex Auvolat <alex@adnab.me>2022-11-08 15:19:46 +0100
commitfc2729cd810b94c47d89e9039ea65726c9a85988 (patch)
tree42ef45430b412671b067ba96e350c967c896ba96
parentd75b37b018fc0ce8e3832c8531d9556ff7a345c9 (diff)
downloadgarage-fc2729cd810b94c47d89e9039ea65726c9a85988.tar.gz
garage-fc2729cd810b94c47d89e9039ea65726c9a85988.zip
Fix integration test
-rwxr-xr-xscript/dev-cluster.sh2
-rwxr-xr-xscript/dev-configure.sh3
-rw-r--r--src/garage/tests/common/garage.rs2
3 files changed, 4 insertions, 3 deletions
diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh
index c7fbe08d..fa0a950e 100755
--- a/script/dev-cluster.sh
+++ b/script/dev-cluster.sh
@@ -11,7 +11,7 @@ PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m")
export RUST_BACKTRACE=1
-export RUST_LOG=garage=info,garage_api=debug,netapp=trace
+export RUST_LOG=garage=info,garage_api=debug
MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m"
WHICH_GARAGE=$(which garage || exit 1)
diff --git a/script/dev-configure.sh b/script/dev-configure.sh
index f0a7843d..9c24bf4b 100755
--- a/script/dev-configure.sh
+++ b/script/dev-configure.sh
@@ -25,7 +25,8 @@ garage -c /tmp/config.1.toml status \
| grep 'NO ROLE' \
| grep -Po '^[0-9a-f]+' \
| while read id; do
- garage -c /tmp/config.1.toml layout assign $id -z dc1 -c 1
+ garage -c /tmp/config.1.toml layout assign $id -z dc1 -c 1G
done
+garage -c /tmp/config.1.toml layout config -r 1
garage -c /tmp/config.1.toml layout apply --version 1
diff --git a/src/garage/tests/common/garage.rs b/src/garage/tests/common/garage.rs
index 44d727f9..a539abb7 100644
--- a/src/garage/tests/common/garage.rs
+++ b/src/garage/tests/common/garage.rs
@@ -126,7 +126,7 @@ api_bind_addr = "127.0.0.1:{admin_port}"
self.command()
.args(["layout", "assign"])
.arg(node_short_id)
- .args(["-c", "1", "-z", "unzonned"])
+ .args(["-c", "1G", "-z", "unzonned"])
.quiet()
.expect_success_status("Could not assign garage node layout");
self.command()