diff options
44 files changed, 83 insertions, 58 deletions
@@ -87,7 +87,7 @@ Table of Contents * `export AWS_ACCESS_KEY_ID=admin ; export AWS_SECRET_ACCESS_KEY=key` as the admin credentials to access the object store. * Run `weed server -dir=/some/data/dir -s3` to start one master, one volume server, one filer, and one S3 gateway. -Also, to increase capacity, just add more volume servers by running `weed volume -dir="/some/data/dir2" -mserver="<master_host>:9333" -port=8081` locally, or on a different machine, or on thousands of machines. That is it! +Also, to increase capacity, just add more volume servers by running `weed volume -dir="/some/data/dir2" -master="<master_host>:9333" -port=8081` locally, or on a different machine, or on thousands of machines. That is it! ## Quick Start SeaweedFS S3 on AWS ## * Setup fast production-ready [SeaweedFS S3 on AWS with cloudformation](https://aws.amazon.com/marketplace/pp/prodview-nzelz5gprlrjc) @@ -206,8 +206,8 @@ SeaweedFS uses HTTP REST operations to read, write, and delete. The responses ar ### Start Volume Servers ### ``` -> weed volume -dir="/tmp/data1" -max=5 -mserver="localhost:9333" -port=8080 & -> weed volume -dir="/tmp/data2" -max=10 -mserver="localhost:9333" -port=8081 & +> weed volume -dir="/tmp/data1" -max=5 -master="localhost:9333" -port=8080 & +> weed volume -dir="/tmp/data2" -max=10 -master="localhost:9333" -port=8081 & ``` ### Write File ### diff --git a/docker/admin_integration/docker-compose-ec-test.yml b/docker/admin_integration/docker-compose-ec-test.yml index 73d0ee0ff..1726e61fa 100644 --- a/docker/admin_integration/docker-compose-ec-test.yml +++ b/docker/admin_integration/docker-compose-ec-test.yml @@ -25,7 +25,7 @@ services: ports: - "8080:8080" - "18080:18080" - command: "volume -mserver=master:9333 -ip=volume1 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume1 -dir=/data -max=10" depends_on: - master volumes: @@ -38,7 +38,7 @@ services: ports: - "8081:8080" - "18081:18080" - command: "volume -mserver=master:9333 -ip=volume2 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume2 -dir=/data -max=10" depends_on: - master volumes: @@ -51,7 +51,7 @@ services: ports: - "8082:8080" - "18082:18080" - command: "volume -mserver=master:9333 -ip=volume3 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume3 -dir=/data -max=10" depends_on: - master volumes: @@ -64,7 +64,7 @@ services: ports: - "8083:8080" - "18083:18080" - command: "volume -mserver=master:9333 -ip=volume4 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume4 -dir=/data -max=10" depends_on: - master volumes: @@ -77,7 +77,7 @@ services: ports: - "8084:8080" - "18084:18080" - command: "volume -mserver=master:9333 -ip=volume5 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume5 -dir=/data -max=10" depends_on: - master volumes: @@ -90,7 +90,7 @@ services: ports: - "8085:8080" - "18085:18080" - command: "volume -mserver=master:9333 -ip=volume6 -dir=/data -max=10" + command: "volume -master=master:9333 -ip=volume6 -dir=/data -max=10" depends_on: - master volumes: diff --git a/docker/compose/e2e-mount.yml b/docker/compose/e2e-mount.yml index 5571bf003..eb4631f04 100644 --- a/docker/compose/e2e-mount.yml +++ b/docker/compose/e2e-mount.yml @@ -13,7 +13,7 @@ services: volume: image: chrislusf/seaweedfs:e2e - command: "-v=4 volume -mserver=master:9333 -ip=volume -ip.bind=0.0.0.0 -preStopSeconds=1" + command: "-v=4 volume -master=master:9333 -ip=volume -ip.bind=0.0.0.0 -preStopSeconds=1" healthcheck: test: [ "CMD", "curl", "--fail", "-I", "http://localhost:8080/healthz" ] interval: 2s diff --git a/docker/compose/local-brokers-compose.yml b/docker/compose/local-brokers-compose.yml index 62ec94995..c97becb83 100644 --- a/docker/compose/local-brokers-compose.yml +++ b/docker/compose/local-brokers-compose.yml @@ -36,7 +36,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -dataCenter=dc1 -rack=v1 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' + command: 'volume -dataCenter=dc1 -rack=v1 -master="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' depends_on: - master0 - master1 @@ -46,7 +46,7 @@ services: ports: - 8082:8082 - 18082:18082 - command: 'volume -dataCenter=dc2 -rack=v2 -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' + command: 'volume -dataCenter=dc2 -rack=v2 -master="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' depends_on: - master0 - master1 @@ -56,7 +56,7 @@ services: ports: - 8083:8083 - 18083:18083 - command: 'volume -dataCenter=dc3 -rack=v3 -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' + command: 'volume -dataCenter=dc3 -rack=v3 -master="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' depends_on: - master0 - master1 diff --git a/docker/compose/local-cluster-compose.yml b/docker/compose/local-cluster-compose.yml index 13cbcb861..cde87a41b 100644 --- a/docker/compose/local-cluster-compose.yml +++ b/docker/compose/local-cluster-compose.yml @@ -36,7 +36,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -dataCenter=dc1 -rack=v1 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' + command: 'volume -dataCenter=dc1 -rack=v1 -master="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' depends_on: - master0 - master1 @@ -46,7 +46,7 @@ services: ports: - 8082:8082 - 18082:18082 - command: 'volume -dataCenter=dc2 -rack=v2 -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' + command: 'volume -dataCenter=dc2 -rack=v2 -master="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' depends_on: - master0 - master1 @@ -56,7 +56,7 @@ services: ports: - 8083:8083 - 18083:18083 - command: 'volume -dataCenter=dc3 -rack=v3 -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' + command: 'volume -dataCenter=dc3 -rack=v3 -master="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' depends_on: - master0 - master1 diff --git a/docker/compose/local-dev-compose.yml b/docker/compose/local-dev-compose.yml index 6f0d0fb29..e6167cb1c 100644 --- a/docker/compose/local-dev-compose.yml +++ b/docker/compose/local-dev-compose.yml @@ -16,7 +16,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "-v=1 volume -mserver=master:9333 -port=8080 -ip=volume -preStopSeconds=1 -max=10000" + command: "-v=1 volume -master=master:9333 -port=8080 -ip=volume -preStopSeconds=1 -max=10000" depends_on: - master volumes: diff --git a/docker/compose/local-hashicorp-raft-compose.yml b/docker/compose/local-hashicorp-raft-compose.yml index 4b9814d92..7a5291cc8 100644 --- a/docker/compose/local-hashicorp-raft-compose.yml +++ b/docker/compose/local-hashicorp-raft-compose.yml @@ -42,7 +42,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -dataCenter=dc1 -rack=v1 -mserver="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' + command: 'volume -dataCenter=dc1 -rack=v1 -master="master0:9333,master1:9334,master2:9335" -port=8080 -ip=volume1 -publicUrl=localhost:8080 -preStopSeconds=1' depends_on: - master0 - master1 @@ -51,7 +51,7 @@ services: ports: - 8082:8082 - 18082:18082 - command: 'volume -dataCenter=dc2 -rack=v2 -mserver="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' + command: 'volume -dataCenter=dc2 -rack=v2 -master="master0:9333,master1:9334,master2:9335" -port=8082 -ip=volume2 -publicUrl=localhost:8082 -preStopSeconds=1' depends_on: - master0 - master1 @@ -60,7 +60,7 @@ services: ports: - 8083:8083 - 18083:18083 - command: 'volume -dataCenter=dc3 -rack=v3 -mserver="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' + command: 'volume -dataCenter=dc3 -rack=v3 -master="master0:9333,master1:9334,master2:9335" -port=8083 -ip=volume3 -publicUrl=localhost:8083 -preStopSeconds=1' depends_on: - master0 - master1 diff --git a/docker/compose/local-k8s-compose.yml b/docker/compose/local-k8s-compose.yml index c73103d92..71cf51679 100644 --- a/docker/compose/local-k8s-compose.yml +++ b/docker/compose/local-k8s-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume" + command: "volume -master=master:9333 -port=8080 -ip=volume" depends_on: - master mysql: diff --git a/docker/compose/local-minio-gateway-compose.yml b/docker/compose/local-minio-gateway-compose.yml index 179ea1630..32863afaf 100644 --- a/docker/compose/local-minio-gateway-compose.yml +++ b/docker/compose/local-minio-gateway-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/compose/local-mount-compose.yml b/docker/compose/local-mount-compose.yml index 6f8847050..1baf125fc 100644 --- a/docker/compose/local-mount-compose.yml +++ b/docker/compose/local-mount-compose.yml @@ -12,7 +12,7 @@ services: ports: - 7455:8080 - 9325:9325 - command: 'volume -mserver="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' + command: 'volume -master="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' depends_on: - master filer: diff --git a/docker/compose/local-mount-profile-compose.yml b/docker/compose/local-mount-profile-compose.yml index 65308bd96..ef04d4620 100644 --- a/docker/compose/local-mount-profile-compose.yml +++ b/docker/compose/local-mount-profile-compose.yml @@ -14,7 +14,7 @@ services: - 9325:9325 volumes: - /Volumes/mobile_disk/99:/data - command: 'volume -mserver="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' + command: 'volume -master="master:9333" -port=8080 -metricsPort=9325 -preStopSeconds=1 -publicUrl=localhost:7455' depends_on: - master filer: diff --git a/docker/compose/local-nextcloud-compose.yml b/docker/compose/local-nextcloud-compose.yml index 288ae06e5..52dfb5368 100644 --- a/docker/compose/local-nextcloud-compose.yml +++ b/docker/compose/local-nextcloud-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume" + command: "volume -master=master:9333 -port=8080 -ip=volume" depends_on: - master s3: diff --git a/docker/compose/local-registry-compose.yml b/docker/compose/local-registry-compose.yml index 3aa056a90..0a176c1af 100644 --- a/docker/compose/local-registry-compose.yml +++ b/docker/compose/local-registry-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/compose/local-replicate-compose.yml b/docker/compose/local-replicate-compose.yml index d88a54101..2bf392a35 100644 --- a/docker/compose/local-replicate-compose.yml +++ b/docker/compose/local-replicate-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -preStopSeconds=1" depends_on: - master filer: diff --git a/docker/compose/local-s3tests-compose.yml b/docker/compose/local-s3tests-compose.yml index f89261ec7..2a65138c5 100644 --- a/docker/compose/local-s3tests-compose.yml +++ b/docker/compose/local-s3tests-compose.yml @@ -15,7 +15,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/compose/swarm-etcd.yml b/docker/compose/swarm-etcd.yml index bc9510ad0..ba496995a 100644 --- a/docker/compose/swarm-etcd.yml +++ b/docker/compose/swarm-etcd.yml @@ -71,7 +71,7 @@ services: - net command: - 'volume' - - '-mserver=master:9333' + - '-master=master:9333' - '-port=8080' deploy: mode: global diff --git a/docker/compose/test-etcd-filer.yml b/docker/compose/test-etcd-filer.yml index c6f24c559..6d37ae546 100644 --- a/docker/compose/test-etcd-filer.yml +++ b/docker/compose/test-etcd-filer.yml @@ -17,7 +17,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" + command: "volume -master=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" depends_on: - master s3: diff --git a/docker/seaweedfs-compose.yml b/docker/seaweedfs-compose.yml index d85179769..1a186b2f6 100644 --- a/docker/seaweedfs-compose.yml +++ b/docker/seaweedfs-compose.yml @@ -14,7 +14,7 @@ services: - 8080:8080 - 18080:18080 - 9325:9325 - command: 'volume -ip=volume -mserver="master:9333" -ip.bind=0.0.0.0 -port=8080 -metricsPort=9325' + command: 'volume -ip=volume -master="master:9333" -ip.bind=0.0.0.0 -port=8080 -metricsPort=9325' depends_on: - master filer: diff --git a/docker/seaweedfs-dev-compose.yml b/docker/seaweedfs-dev-compose.yml index 60c139f02..fa4a51926 100644 --- a/docker/seaweedfs-dev-compose.yml +++ b/docker/seaweedfs-dev-compose.yml @@ -12,7 +12,7 @@ services: ports: - 8080:8080 - 18080:18080 - command: 'volume -ip=volume -mserver="master:9333" -ip.bind=0.0.0.0 -port=8080' + command: 'volume -ip=volume -master="master:9333" -ip.bind=0.0.0.0 -port=8080' depends_on: - master filer: diff --git a/k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml b/k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml index 2b8c27449..e29239c32 100644 --- a/k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml @@ -220,7 +220,7 @@ spec: -s3.auditLogConfig=/etc/sw/filer_s3_auditLogConfig.json \ {{- end }} {{- end }} - -master={{ if .Values.global.masterServer }}{{.Values.global.masterServer}}{{ else }}{{ range $index := until (.Values.master.replicas | int) }}${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}{{ if lt $index (sub ($.Values.master.replicas | int) 1) }},{{ end }}{{ end }}{{ end }} \ + -master={{ include "seaweedfs.masterServerArg" . }} \ {{- range .Values.filer.extraArgs }} {{ . }} \ {{- end }} diff --git a/k8s/charts/seaweedfs/templates/master/master-statefulset.yaml b/k8s/charts/seaweedfs/templates/master/master-statefulset.yaml index a70673454..50e0e97d4 100644 --- a/k8s/charts/seaweedfs/templates/master/master-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/master/master-statefulset.yaml @@ -184,7 +184,7 @@ spec: -garbageThreshold={{ .Values.master.garbageThreshold }} \ {{- end }} -ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-master.{{ .Release.Namespace }} \ - -peers={{ range $index := until (.Values.master.replicas | int) }}${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}{{ if lt $index (sub ($.Values.master.replicas | int) 1) }},{{ end }}{{ end }} \ + -peers={{ include "seaweedfs.masterServers" . }} \ {{- range .Values.master.extraArgs }} {{ . }} \ {{- end }} diff --git a/k8s/charts/seaweedfs/templates/shared/_helpers.tpl b/k8s/charts/seaweedfs/templates/shared/_helpers.tpl index d22d14224..b38df3dc3 100644 --- a/k8s/charts/seaweedfs/templates/shared/_helpers.tpl +++ b/k8s/charts/seaweedfs/templates/shared/_helpers.tpl @@ -246,3 +246,28 @@ If allInOne is enabled, point to the all-in-one service; otherwise, point to the {{- end -}} {{- printf "%s%s.%s:%d" (include "seaweedfs.name" .) $serviceNameSuffix .Release.Namespace (int .Values.filer.port) -}} {{- end -}} + +{{/* +Generate comma-separated list of master server addresses. +Usage: {{ include "seaweedfs.masterServers" . }} +Output example: ${SEAWEEDFS_FULLNAME}-master-0.${SEAWEEDFS_FULLNAME}-master.namespace:9333,${SEAWEEDFS_FULLNAME}-master-1... +*/}} +{{- define "seaweedfs.masterServers" -}} +{{- $fullname := include "seaweedfs.name" . -}} +{{- range $index := until (.Values.master.replicas | int) -}} +{{- if $index }},{{ end -}} +${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }} +{{- end -}} +{{- end -}} + +{{/* +Generate master server argument value, using global.masterServer if set, otherwise the generated list. +Usage: {{ include "seaweedfs.masterServerArg" . }} +*/}} +{{- define "seaweedfs.masterServerArg" -}} +{{- if .Values.global.masterServer -}} +{{- .Values.global.masterServer -}} +{{- else -}} +{{- include "seaweedfs.masterServers" . -}} +{{- end -}} +{{- end -}} diff --git a/k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml b/k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml index 1a8964a55..6a551a6c9 100644 --- a/k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml +++ b/k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml @@ -196,7 +196,7 @@ spec: -minFreeSpacePercent={{ $volume.minFreeSpacePercent }} \ -ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-{{ $volumeName }}.{{ $.Release.Namespace }} \ -compactionMBps={{ $volume.compactionMBps }} \ - -mserver={{ if $.Values.global.masterServer }}{{ $.Values.global.masterServer}}{{ else }}{{ range $index := until ($.Values.master.replicas | int) }}${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}{{ if lt $index (sub ($.Values.master.replicas | int) 1) }},{{ end }}{{ end }}{{ end }} + -master={{ include "seaweedfs.masterServerArg" $ }} \ {{- range $volume.extraArgs }} {{ . }} \ {{- end }} diff --git a/other/java/hdfs3/README.md b/other/java/hdfs3/README.md index e08f02a7c..8d1591ba0 100644 --- a/other/java/hdfs3/README.md +++ b/other/java/hdfs3/README.md @@ -32,7 +32,7 @@ These tests verify actual FileSystem operations against a running SeaweedFS inst weed master # Terminal 2: Start volume server - weed volume -mserver=localhost:9333 + weed volume -master=localhost:9333 # Terminal 3: Start filer weed filer -master=localhost:9333 diff --git a/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml b/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml index 9098515ef..14ea1ca78 100644 --- a/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml +++ b/seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml @@ -32,7 +32,7 @@ services: - "18080:18080" command: > volume - -mserver=seaweedfs-master:9333 + -master=seaweedfs-master:9333 -port=8080 -dir=/data -max=100 diff --git a/seaweedfs-rdma-sidecar/docker-compose.rdma-sim.yml b/seaweedfs-rdma-sidecar/docker-compose.rdma-sim.yml index 527a0d67b..fc8de08dc 100644 --- a/seaweedfs-rdma-sidecar/docker-compose.rdma-sim.yml +++ b/seaweedfs-rdma-sidecar/docker-compose.rdma-sim.yml @@ -21,7 +21,7 @@ services: seaweedfs-volume: image: chrislusf/seaweedfs:latest container_name: seaweedfs-volume - command: volume -mserver=seaweedfs-master:9333 -ip=seaweedfs-volume -port=8080 -dir=/data + command: volume -master=seaweedfs-master:9333 -ip=seaweedfs-volume -port=8080 -dir=/data ports: - "8080:8080" volumes: diff --git a/seaweedfs-rdma-sidecar/docker-compose.yml b/seaweedfs-rdma-sidecar/docker-compose.yml index b2970f114..b046ef8a0 100644 --- a/seaweedfs-rdma-sidecar/docker-compose.yml +++ b/seaweedfs-rdma-sidecar/docker-compose.yml @@ -21,7 +21,7 @@ services: seaweedfs-volume: image: chrislusf/seaweedfs:latest container_name: seaweedfs-volume - command: volume -mserver=seaweedfs-master:9333 -ip=seaweedfs-volume -port=8080 -dir=/data + command: volume -master=seaweedfs-master:9333 -ip=seaweedfs-volume -port=8080 -dir=/data ports: - "8080:8080" volumes: diff --git a/seaweedfs-rdma-sidecar/scripts/demo-mount-rdma.sh b/seaweedfs-rdma-sidecar/scripts/demo-mount-rdma.sh index cc4b8b394..890d6ccc0 100755 --- a/seaweedfs-rdma-sidecar/scripts/demo-mount-rdma.sh +++ b/seaweedfs-rdma-sidecar/scripts/demo-mount-rdma.sh @@ -107,7 +107,7 @@ wait_for_service "Master" "http://localhost:9333/cluster/status" # Start SeaweedFS Volume Server echo -e "${BLUE}💾 Starting SeaweedFS Volume Server...${NC}" -./weed volume -mserver=localhost:9333 -port=8080 -dir=/tmp/seaweedfs-volume & +./weed volume -master=localhost:9333 -port=8080 -dir=/tmp/seaweedfs-volume & VOLUME_PID=$! wait_for_service "Volume Server" "http://localhost:8080/status" 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"), diff --git a/weed/storage/volume_vacuum_test.go b/weed/storage/volume_vacuum_test.go index 797452bb3..29b990f70 100644 --- a/weed/storage/volume_vacuum_test.go +++ b/weed/storage/volume_vacuum_test.go @@ -17,7 +17,7 @@ makediff test steps "garbageThreshold" for master and option "max" for volume should be set with specific value which would let preparing test prerequisite easier ) a) ./weed master -garbageThreshold=0.99 -mdir=./m - b) ./weed volume -dir=./data -max=1 -mserver=localhost:9333 -port=8080 + b) ./weed volume -dir=./data -max=1 -master=localhost:9333 -port=8080 2. upload 4 different files, you could call dir/assign to get 4 different fids a) upload file A with fid a b) upload file B with fid b |