try to fix smoke test

dev cluster: don't ipv6 (fixes smoke test in container?)
This commit is contained in:
Alex 2021-02-17 19:30:31 +01:00
parent b5dc4d33a9
commit 3b023c0c3b
3 changed files with 11 additions and 6 deletions

View file

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -ex
SCRIPT_FOLDER="`dirname \"$0\"`" SCRIPT_FOLDER="`dirname \"$0\"`"
REPO_FOLDER="${SCRIPT_FOLDER}/../" REPO_FOLDER="${SCRIPT_FOLDER}/../"
GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"

View file

@ -24,11 +24,11 @@ cat > $CONF_PATH <<EOF
block_size = 1048576 # objects are split in blocks of maximum this number of bytes block_size = 1048576 # objects are split in blocks of maximum this number of bytes
metadata_dir = "/tmp/garage-meta-$count" metadata_dir = "/tmp/garage-meta-$count"
data_dir = "/tmp/garage-data-$count" data_dir = "/tmp/garage-data-$count"
rpc_bind_addr = "[::]:$((3900+$count))" # the port other Garage nodes will use to talk to this node rpc_bind_addr = "0.0.0.0:$((3900+$count))" # the port other Garage nodes will use to talk to this node
bootstrap_peers = [ bootstrap_peers = [
"[::1]:3901", "127.0.0.1:3901",
"[::1]:3902", "127.0.0.1:3902",
"[::1]:3903" "127.0.0.1:3903"
] ]
max_concurrent_rpc_requests = 12 max_concurrent_rpc_requests = 12
data_replication_factor = 3 data_replication_factor = 3
@ -36,11 +36,11 @@ meta_replication_factor = 3
meta_epidemic_fanout = 3 meta_epidemic_fanout = 3
[s3_api] [s3_api]
api_bind_addr = "[::]:$((3910+$count))" # the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part. api_bind_addr = "0.0.0.0:$((3910+$count))" # 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_region = "garage" # set this to anything. S3 API calls will fail if they are not made against the region set here.
[s3_web] [s3_web]
bind_addr = "[::]:$((3920+$count))" bind_addr = "0.0.0.0:$((3920+$count))"
root_domain = ".garage.tld" root_domain = ".garage.tld"
index = "index.html" index = "index.html"
EOF EOF

View file

@ -1,11 +1,14 @@
#!/bin/bash #!/bin/bash
set -ex
SCRIPT_FOLDER="`dirname \"$0\"`" SCRIPT_FOLDER="`dirname \"$0\"`"
REPO_FOLDER="${SCRIPT_FOLDER}/../" REPO_FOLDER="${SCRIPT_FOLDER}/../"
GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
GARAGE_RELEASE="${REPO_FOLDER}/target/release/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
sleep 5
until garage status 2>&1|grep -q Healthy ; do until garage status 2>&1|grep -q Healthy ; do
echo "cluster starting..." echo "cluster starting..."
sleep 1 sleep 1