aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/erasure_coding/ec_integration_test.go4
-rw-r--r--test/fuse_integration/framework.go2
-rw-r--r--test/java/spark/docker-compose.yml2
-rw-r--r--test/kafka/docker-compose.yml2
-rw-r--r--test/kafka/kafka-client-loadtest/docker-compose.yml2
-rw-r--r--test/kms/docker-compose.yml2
-rw-r--r--test/mq/README.md2
-rw-r--r--test/s3/copying/Makefile2
-rw-r--r--test/s3/iam/Makefile2
-rw-r--r--test/s3/iam/docker-compose.test.yml2
-rw-r--r--test/s3/iam/docker-compose.yml2
-rw-r--r--test/s3/parquet/Makefile2
-rw-r--r--test/s3/sse/Makefile4
-rw-r--r--test/s3/sse/docker-compose.yml2
-rw-r--r--test/sftp/framework.go2
15 files changed, 17 insertions, 17 deletions
diff --git a/test/erasure_coding/ec_integration_test.go b/test/erasure_coding/ec_integration_test.go
index 67f8eed04..e2acebd53 100644
--- a/test/erasure_coding/ec_integration_test.go
+++ b/test/erasure_coding/ec_integration_test.go
@@ -431,7 +431,7 @@ func startSeaweedFSCluster(ctx context.Context, dataDir string) (*TestCluster, e
"-port", port,
"-dir", volumeDir,
"-max", "10",
- "-mserver", "127.0.0.1:9333",
+ "-master", "127.0.0.1:9333",
"-ip", "127.0.0.1",
"-dataCenter", "dc1",
"-rack", rack,
@@ -956,7 +956,7 @@ func startMultiDiskCluster(ctx context.Context, dataDir string) (*MultiDiskClust
"-port", port,
"-dir", strings.Join(diskDirs, ","),
"-max", strings.Join(maxVolumes, ","),
- "-mserver", "127.0.0.1:9334",
+ "-master", "127.0.0.1:9334",
"-ip", "127.0.0.1",
"-dataCenter", "dc1",
"-rack", rack,
diff --git a/test/fuse_integration/framework.go b/test/fuse_integration/framework.go
index 000dddbfe..2fe7ef343 100644
--- a/test/fuse_integration/framework.go
+++ b/test/fuse_integration/framework.go
@@ -194,7 +194,7 @@ func (f *FuseTestFramework) startMaster(config *TestConfig) error {
func (f *FuseTestFramework) startVolumeServers(config *TestConfig) error {
args := []string{
"volume",
- "-mserver=" + f.masterAddr,
+ "-master=" + f.masterAddr,
"-ip=127.0.0.1",
"-port=18080",
"-dir=" + filepath.Join(f.dataDir, "volume"),
diff --git a/test/java/spark/docker-compose.yml b/test/java/spark/docker-compose.yml
index ed8757b88..b41421ea3 100644
--- a/test/java/spark/docker-compose.yml
+++ b/test/java/spark/docker-compose.yml
@@ -27,7 +27,7 @@ services:
ports:
- "8080:8080"
- "18080:18080"
- command: "volume -mserver=seaweedfs-master:9333 -ip=seaweedfs-volume -ip.bind=0.0.0.0 -port=8080 -port.grpc=18080 -publicUrl=seaweedfs-volume:8080 -max=100 -dir=/data -preStopSeconds=1"
+ command: "volume -master=seaweedfs-master:9333 -ip=seaweedfs-volume -ip.bind=0.0.0.0 -port=8080 -port.grpc=18080 -publicUrl=seaweedfs-volume:8080 -max=100 -dir=/data -preStopSeconds=1"
volumes:
- seaweedfs-volume-data:/data
depends_on:
diff --git a/test/kafka/docker-compose.yml b/test/kafka/docker-compose.yml
index 73e70cbe0..e19a39a5a 100644
--- a/test/kafka/docker-compose.yml
+++ b/test/kafka/docker-compose.yml
@@ -111,7 +111,7 @@ services:
- "18080:18080" # gRPC port
command:
- volume
- - -mserver=seaweedfs-master:9333
+ - -master=seaweedfs-master:9333
- -ip=seaweedfs-volume
- -port=8080
- -port.grpc=18080
diff --git a/test/kafka/kafka-client-loadtest/docker-compose.yml b/test/kafka/kafka-client-loadtest/docker-compose.yml
index 5ac715610..c5a20d155 100644
--- a/test/kafka/kafka-client-loadtest/docker-compose.yml
+++ b/test/kafka/kafka-client-loadtest/docker-compose.yml
@@ -113,7 +113,7 @@ services:
- "18080:18080"
command:
- volume
- - -mserver=seaweedfs-master:9333
+ - -master=seaweedfs-master:9333
- -ip=seaweedfs-volume
- -port=8080
- -port.grpc=18080
diff --git a/test/kms/docker-compose.yml b/test/kms/docker-compose.yml
index 381d9fbb4..2327680da 100644
--- a/test/kms/docker-compose.yml
+++ b/test/kms/docker-compose.yml
@@ -64,7 +64,7 @@ services:
- "8080:8080"
command:
- volume
- - -mserver=seaweedfs-master:9333
+ - -master=seaweedfs-master:9333
- -ip=seaweedfs-volume
- -publicUrl=seaweedfs-volume:8080
depends_on:
diff --git a/test/mq/README.md b/test/mq/README.md
index 34eb3b1c0..d1ed1ce05 100644
--- a/test/mq/README.md
+++ b/test/mq/README.md
@@ -17,7 +17,7 @@ weed server -mq.broker -mq.agent -filer -volume -master.peers=none
# Or start components separately
weed master -peers=none
-weed volume -mserver=localhost:9333
+weed volume -master=localhost:9333
weed filer -master=localhost:9333
weed mq.broker -filer=localhost:8888
weed mq.agent -brokers=localhost:17777
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
diff --git a/test/sftp/framework.go b/test/sftp/framework.go
index 5572eac28..ea4ac3e35 100644
--- a/test/sftp/framework.go
+++ b/test/sftp/framework.go
@@ -268,7 +268,7 @@ func (f *SftpTestFramework) startMaster(config *TestConfig) error {
func (f *SftpTestFramework) startVolumeServer(config *TestConfig) error {
args := []string{
"volume",
- "-mserver=" + f.masterAddr,
+ "-master=" + f.masterAddr,
"-ip=127.0.0.1",
"-port=18080",
"-dir=" + filepath.Join(f.dataDir, "volume"),