diff options
Diffstat (limited to 'test/s3')
| -rw-r--r-- | test/s3/copying/Makefile | 2 | ||||
| -rw-r--r-- | test/s3/iam/Makefile | 2 | ||||
| -rw-r--r-- | test/s3/iam/docker-compose.test.yml | 2 | ||||
| -rw-r--r-- | test/s3/iam/docker-compose.yml | 2 | ||||
| -rw-r--r-- | test/s3/parquet/Makefile | 2 | ||||
| -rw-r--r-- | test/s3/sse/Makefile | 4 | ||||
| -rw-r--r-- | test/s3/sse/docker-compose.yml | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/test/s3/copying/Makefile b/test/s3/copying/Makefile index 3aa8b7b35..225798900 100644 --- a/test/s3/copying/Makefile +++ b/test/s3/copying/Makefile @@ -74,7 +74,7 @@ start-seaweedfs: check-binary @sleep 3 # Start volume server - @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -mserver=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-copying-volume -ip=127.0.0.1 > /tmp/seaweedfs-volume.log 2>&1 & + @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -master=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-copying-volume -ip=127.0.0.1 > /tmp/seaweedfs-volume.log 2>&1 & @sleep 3 # Start filer server (using standard SeaweedFS gRPC port convention: HTTP port + 10000) diff --git a/test/s3/iam/Makefile b/test/s3/iam/Makefile index b3fa9d37b..7a3f8f950 100644 --- a/test/s3/iam/Makefile +++ b/test/s3/iam/Makefile @@ -75,7 +75,7 @@ start-services: ## Start SeaweedFS services for testing -dataCenter=dc1 -rack=rack1 \ -dir=test-volume-data \ -max=100 \ - -mserver=localhost:$(MASTER_PORT) > weed-volume.log 2>&1 & \ + -master=localhost:$(MASTER_PORT) > weed-volume.log 2>&1 & \ echo $$! > $(VOLUME_PID_FILE) @echo "Waiting for volume server to be ready..." diff --git a/test/s3/iam/docker-compose.test.yml b/test/s3/iam/docker-compose.test.yml index bb229cfc3..9a46ef365 100644 --- a/test/s3/iam/docker-compose.test.yml +++ b/test/s3/iam/docker-compose.test.yml @@ -21,7 +21,7 @@ services: seaweedfs-volume: image: chrislusf/seaweedfs:latest container_name: seaweedfs-volume-test - command: volume -dir=/data -port=8083 -mserver=seaweedfs-master:9333 + command: volume -dir=/data -port=8083 -master=seaweedfs-master:9333 ports: - "8083:8083" volumes: diff --git a/test/s3/iam/docker-compose.yml b/test/s3/iam/docker-compose.yml index fd3e3039f..ad4d08278 100644 --- a/test/s3/iam/docker-compose.yml +++ b/test/s3/iam/docker-compose.yml @@ -51,7 +51,7 @@ services: ports: - "8083:8083" - "18083:18083" - command: "volume -ip=weed-volume -port=8083 -dir=/data -mserver=weed-master:9333 -dataCenter=dc1 -rack=rack1" + command: "volume -ip=weed-volume -port=8083 -dir=/data -master=weed-master:9333 -dataCenter=dc1 -rack=rack1" volumes: - volume-data:/data networks: diff --git a/test/s3/parquet/Makefile b/test/s3/parquet/Makefile index fa91cfeaa..0aa6c8117 100644 --- a/test/s3/parquet/Makefile +++ b/test/s3/parquet/Makefile @@ -134,7 +134,7 @@ start-seaweedfs-ci: check-binary # Start volume server with master HTTP port and increased capacity @echo "Starting volume server..." - @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -mserver=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-parquet-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 -preStopSeconds=1 > /tmp/seaweedfs-parquet-volume.log 2>&1 & + @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -master=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-parquet-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 -preStopSeconds=1 > /tmp/seaweedfs-parquet-volume.log 2>&1 & @sleep 5 # Start filer server with embedded S3 diff --git a/test/s3/sse/Makefile b/test/s3/sse/Makefile index d92fc90a6..8d0869a82 100644 --- a/test/s3/sse/Makefile +++ b/test/s3/sse/Makefile @@ -102,7 +102,7 @@ start-seaweedfs: check-binary @sleep 3 # Start volume server with master HTTP port and increased capacity - @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -mserver=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-sse-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 > /tmp/seaweedfs-sse-volume.log 2>&1 & + @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -master=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-sse-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 > /tmp/seaweedfs-sse-volume.log 2>&1 & @sleep 5 # Start filer server (using standard SeaweedFS gRPC port convention: HTTP port + 10000) @@ -359,7 +359,7 @@ start-seaweedfs-ci: check-binary # Start volume server with master HTTP port and increased capacity @echo "Starting volume server..." - @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -mserver=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-sse-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 > /tmp/seaweedfs-sse-volume.log 2>&1 & + @nohup $(SEAWEEDFS_BINARY) volume -port=$(VOLUME_PORT) -master=127.0.0.1:$(MASTER_PORT) -dir=/tmp/seaweedfs-test-sse-volume -max=$(VOLUME_MAX_COUNT) -ip=127.0.0.1 > /tmp/seaweedfs-sse-volume.log 2>&1 & @sleep 5 # Create S3 JSON configuration with KMS (Local provider) and basic identity for embedded S3 diff --git a/test/s3/sse/docker-compose.yml b/test/s3/sse/docker-compose.yml index 448788af4..82c05c03e 100644 --- a/test/s3/sse/docker-compose.yml +++ b/test/s3/sse/docker-compose.yml @@ -50,7 +50,7 @@ services: - "8080:8080" command: - volume - - -mserver=seaweedfs-master:9333 + - -master=seaweedfs-master:9333 - -port=8080 - -ip=seaweedfs-volume - -publicUrl=seaweedfs-volume:8080 |