Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix: add missing backslash for volume extraArgs in helm chart (#7676) 

Fixes #7467

The -mserver argument line in volume-statefulset.yaml was missing a
trailing backslash, which prevented extraArgs from being passed to
the weed volume process.

Also:
- Extracted master server list generation logic into shared helper
  templates in _helpers.tpl for better maintainability
- Updated all occurrences of deprecated -mserver flag to -master
  across docker-compose files, test files, and documentation
pull/7685/head
Chris Lu 3 days ago
committed by GitHub
parent
cea12ba3c4
commit
d5f21fd8ba
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
44 changed files with 83 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      README.md
  2. 12
      docker/admin_integration/docker-compose-ec-test.yml
  3. 2
      docker/compose/e2e-mount.yml
  4. 6
      docker/compose/local-brokers-compose.yml
  5. 6
      docker/compose/local-cluster-compose.yml
  6. 2
      docker/compose/local-dev-compose.yml
  7. 6
      docker/compose/local-hashicorp-raft-compose.yml
  8. 2
      docker/compose/local-k8s-compose.yml
  9. 2
      docker/compose/local-minio-gateway-compose.yml
  10. 2
      docker/compose/local-mount-compose.yml
  11. 2
      docker/compose/local-mount-profile-compose.yml
  12. 2
      docker/compose/local-nextcloud-compose.yml
  13. 2
      docker/compose/local-registry-compose.yml
  14. 2
      docker/compose/local-replicate-compose.yml
  15. 2
      docker/compose/local-s3tests-compose.yml
  16. 2
      docker/compose/swarm-etcd.yml
  17. 2
      docker/compose/test-etcd-filer.yml
  18. 2
      docker/seaweedfs-compose.yml
  19. 2
      docker/seaweedfs-dev-compose.yml
  20. 2
      k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
  21. 2
      k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
  22. 25
      k8s/charts/seaweedfs/templates/shared/_helpers.tpl
  23. 2
      k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml
  24. 2
      other/java/hdfs3/README.md
  25. 2
      seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml
  26. 2
      seaweedfs-rdma-sidecar/docker-compose.rdma-sim.yml
  27. 2
      seaweedfs-rdma-sidecar/docker-compose.yml
  28. 2
      seaweedfs-rdma-sidecar/scripts/demo-mount-rdma.sh
  29. 4
      test/erasure_coding/ec_integration_test.go
  30. 2
      test/fuse_integration/framework.go
  31. 2
      test/java/spark/docker-compose.yml
  32. 2
      test/kafka/docker-compose.yml
  33. 2
      test/kafka/kafka-client-loadtest/docker-compose.yml
  34. 2
      test/kms/docker-compose.yml
  35. 2
      test/mq/README.md
  36. 2
      test/s3/copying/Makefile
  37. 2
      test/s3/iam/Makefile
  38. 2
      test/s3/iam/docker-compose.test.yml
  39. 2
      test/s3/iam/docker-compose.yml
  40. 2
      test/s3/parquet/Makefile
  41. 4
      test/s3/sse/Makefile
  42. 2
      test/s3/sse/docker-compose.yml
  43. 2
      test/sftp/framework.go
  44. 2
      weed/storage/volume_vacuum_test.go

6
README.md
View File

@ -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. * `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. * 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 ## ## Quick Start SeaweedFS S3 on AWS ##
* Setup fast production-ready [SeaweedFS S3 on AWS with cloudformation](https://aws.amazon.com/marketplace/pp/prodview-nzelz5gprlrjc) * 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 ### ### 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 ### ### Write File ###

12
docker/admin_integration/docker-compose-ec-test.yml
View File

@ -25,7 +25,7 @@ services:
ports: ports:
- "8080:8080" - "8080:8080"
- "18080:18080" - "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: depends_on:
- master - master
volumes: volumes:
@ -38,7 +38,7 @@ services:
ports: ports:
- "8081:8080" - "8081:8080"
- "18081:18080" - "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: depends_on:
- master - master
volumes: volumes:
@ -51,7 +51,7 @@ services:
ports: ports:
- "8082:8080" - "8082:8080"
- "18082:18080" - "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: depends_on:
- master - master
volumes: volumes:
@ -64,7 +64,7 @@ services:
ports: ports:
- "8083:8080" - "8083:8080"
- "18083:18080" - "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: depends_on:
- master - master
volumes: volumes:
@ -77,7 +77,7 @@ services:
ports: ports:
- "8084:8080" - "8084:8080"
- "18084:18080" - "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: depends_on:
- master - master
volumes: volumes:
@ -90,7 +90,7 @@ services:
ports: ports:
- "8085:8080" - "8085:8080"
- "18085:18080" - "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: depends_on:
- master - master
volumes: volumes:

2
docker/compose/e2e-mount.yml
View File

@ -13,7 +13,7 @@ services:
volume: volume:
image: chrislusf/seaweedfs:e2e 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: healthcheck:
test: [ "CMD", "curl", "--fail", "-I", "http://localhost:8080/healthz" ] test: [ "CMD", "curl", "--fail", "-I", "http://localhost:8080/healthz" ]
interval: 2s interval: 2s

6
docker/compose/local-brokers-compose.yml
View File

@ -36,7 +36,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master0 - master0
- master1 - master1
@ -46,7 +46,7 @@ services:
ports: ports:
- 8082:8082 - 8082:8082
- 18082:18082 - 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: depends_on:
- master0 - master0
- master1 - master1
@ -56,7 +56,7 @@ services:
ports: ports:
- 8083:8083 - 8083:8083
- 18083:18083 - 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: depends_on:
- master0 - master0
- master1 - master1

6
docker/compose/local-cluster-compose.yml
View File

@ -36,7 +36,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master0 - master0
- master1 - master1
@ -46,7 +46,7 @@ services:
ports: ports:
- 8082:8082 - 8082:8082
- 18082:18082 - 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: depends_on:
- master0 - master0
- master1 - master1
@ -56,7 +56,7 @@ services:
ports: ports:
- 8083:8083 - 8083:8083
- 18083:18083 - 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: depends_on:
- master0 - master0
- master1 - master1

2
docker/compose/local-dev-compose.yml
View File

@ -16,7 +16,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
volumes: volumes:

6
docker/compose/local-hashicorp-raft-compose.yml
View File

@ -42,7 +42,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master0 - master0
- master1 - master1
@ -51,7 +51,7 @@ services:
ports: ports:
- 8082:8082 - 8082:8082
- 18082:18082 - 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: depends_on:
- master0 - master0
- master1 - master1
@ -60,7 +60,7 @@ services:
ports: ports:
- 8083:8083 - 8083:8083
- 18083:18083 - 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: depends_on:
- master0 - master0
- master1 - master1

2
docker/compose/local-k8s-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 18080:18080
command: "volume -mserver=master:9333 -port=8080 -ip=volume"
command: "volume -master=master:9333 -port=8080 -ip=volume"
depends_on: depends_on:
- master - master
mysql: mysql:

2
docker/compose/local-minio-gateway-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
s3: s3:

2
docker/compose/local-mount-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 7455:8080 - 7455:8080
- 9325:9325 - 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: depends_on:
- master - master
filer: filer:

2
docker/compose/local-mount-profile-compose.yml
View File

@ -14,7 +14,7 @@ services:
- 9325:9325 - 9325:9325
volumes: volumes:
- /Volumes/mobile_disk/99:/data - /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: depends_on:
- master - master
filer: filer:

2
docker/compose/local-nextcloud-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 18080:18080
command: "volume -mserver=master:9333 -port=8080 -ip=volume"
command: "volume -master=master:9333 -port=8080 -ip=volume"
depends_on: depends_on:
- master - master
s3: s3:

2
docker/compose/local-registry-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
s3: s3:

2
docker/compose/local-replicate-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
filer: filer:

2
docker/compose/local-s3tests-compose.yml
View File

@ -15,7 +15,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
s3: s3:

2
docker/compose/swarm-etcd.yml
View File

@ -71,7 +71,7 @@ services:
- net - net
command: command:
- 'volume' - 'volume'
- '-mserver=master:9333'
- '-master=master:9333'
- '-port=8080' - '-port=8080'
deploy: deploy:
mode: global mode: global

2
docker/compose/test-etcd-filer.yml
View File

@ -17,7 +17,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
s3: s3:

2
docker/seaweedfs-compose.yml
View File

@ -14,7 +14,7 @@ services:
- 8080:8080 - 8080:8080
- 18080:18080 - 18080:18080
- 9325:9325 - 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: depends_on:
- master - master
filer: filer:

2
docker/seaweedfs-dev-compose.yml
View File

@ -12,7 +12,7 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
- 18080:18080 - 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: depends_on:
- master - master
filer: filer:

2
k8s/charts/seaweedfs/templates/filer/filer-statefulset.yaml
View File

@ -220,7 +220,7 @@ spec:
-s3.auditLogConfig=/etc/sw/filer_s3_auditLogConfig.json \ -s3.auditLogConfig=/etc/sw/filer_s3_auditLogConfig.json \
{{- end }} {{- end }}
{{- 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 }} {{- range .Values.filer.extraArgs }}
{{ . }} \ {{ . }} \
{{- end }} {{- end }}

2
k8s/charts/seaweedfs/templates/master/master-statefulset.yaml
View File

@ -184,7 +184,7 @@ spec:
-garbageThreshold={{ .Values.master.garbageThreshold }} \ -garbageThreshold={{ .Values.master.garbageThreshold }} \
{{- end }} {{- end }}
-ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-master.{{ .Release.Namespace }} \ -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 }} {{- range .Values.master.extraArgs }}
{{ . }} \ {{ . }} \
{{- end }} {{- end }}

25
k8s/charts/seaweedfs/templates/shared/_helpers.tpl
View File

@ -246,3 +246,28 @@ If allInOne is enabled, point to the all-in-one service; otherwise, point to the
{{- end -}} {{- end -}}
{{- printf "%s%s.%s:%d" (include "seaweedfs.name" .) $serviceNameSuffix .Release.Namespace (int .Values.filer.port) -}} {{- printf "%s%s.%s:%d" (include "seaweedfs.name" .) $serviceNameSuffix .Release.Namespace (int .Values.filer.port) -}}
{{- end -}} {{- 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 -}}

2
k8s/charts/seaweedfs/templates/volume/volume-statefulset.yaml
View File

@ -196,7 +196,7 @@ spec:
-minFreeSpacePercent={{ $volume.minFreeSpacePercent }} \ -minFreeSpacePercent={{ $volume.minFreeSpacePercent }} \
-ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-{{ $volumeName }}.{{ $.Release.Namespace }} \ -ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-{{ $volumeName }}.{{ $.Release.Namespace }} \
-compactionMBps={{ $volume.compactionMBps }} \ -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 }} {{- range $volume.extraArgs }}
{{ . }} \ {{ . }} \
{{- end }} {{- end }}

2
other/java/hdfs3/README.md
View File

@ -32,7 +32,7 @@ These tests verify actual FileSystem operations against a running SeaweedFS inst
weed master weed master
# Terminal 2: Start volume server # Terminal 2: Start volume server
weed volume -mserver=localhost:9333
weed volume -master=localhost:9333
# Terminal 3: Start filer # Terminal 3: Start filer
weed filer -master=localhost:9333 weed filer -master=localhost:9333

2
seaweedfs-rdma-sidecar/docker-compose.mount-rdma.yml
View File

@ -32,7 +32,7 @@ services:
- "18080:18080" - "18080:18080"
command: > command: >
volume volume
-mserver=seaweedfs-master:9333
-master=seaweedfs-master:9333
-port=8080 -port=8080
-dir=/data -dir=/data
-max=100 -max=100

2
seaweedfs-rdma-sidecar/docker-compose.rdma-sim.yml
View File

@ -21,7 +21,7 @@ services:
seaweedfs-volume: seaweedfs-volume:
image: chrislusf/seaweedfs:latest image: chrislusf/seaweedfs:latest
container_name: seaweedfs-volume 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: ports:
- "8080:8080" - "8080:8080"
volumes: volumes:

2
seaweedfs-rdma-sidecar/docker-compose.yml
View File

@ -21,7 +21,7 @@ services:
seaweedfs-volume: seaweedfs-volume:
image: chrislusf/seaweedfs:latest image: chrislusf/seaweedfs:latest
container_name: seaweedfs-volume 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: ports:
- "8080:8080" - "8080:8080"
volumes: volumes:

2
seaweedfs-rdma-sidecar/scripts/demo-mount-rdma.sh
View File

@ -107,7 +107,7 @@ wait_for_service "Master" "http://localhost:9333/cluster/status"
# Start SeaweedFS Volume Server # Start SeaweedFS Volume Server
echo -e "${BLUE}💾 Starting SeaweedFS Volume Server...${NC}" 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=$! VOLUME_PID=$!
wait_for_service "Volume Server" "http://localhost:8080/status" wait_for_service "Volume Server" "http://localhost:8080/status"

4
test/erasure_coding/ec_integration_test.go
View File

@ -431,7 +431,7 @@ func startSeaweedFSCluster(ctx context.Context, dataDir string) (*TestCluster, e
"-port", port, "-port", port,
"-dir", volumeDir, "-dir", volumeDir,
"-max", "10", "-max", "10",
"-mserver", "127.0.0.1:9333",
"-master", "127.0.0.1:9333",
"-ip", "127.0.0.1", "-ip", "127.0.0.1",
"-dataCenter", "dc1", "-dataCenter", "dc1",
"-rack", rack, "-rack", rack,
@ -956,7 +956,7 @@ func startMultiDiskCluster(ctx context.Context, dataDir string) (*MultiDiskClust
"-port", port, "-port", port,
"-dir", strings.Join(diskDirs, ","), "-dir", strings.Join(diskDirs, ","),
"-max", strings.Join(maxVolumes, ","), "-max", strings.Join(maxVolumes, ","),
"-mserver", "127.0.0.1:9334",
"-master", "127.0.0.1:9334",
"-ip", "127.0.0.1", "-ip", "127.0.0.1",
"-dataCenter", "dc1", "-dataCenter", "dc1",
"-rack", rack, "-rack", rack,

2
test/fuse_integration/framework.go
View File

@ -194,7 +194,7 @@ func (f *FuseTestFramework) startMaster(config *TestConfig) error {
func (f *FuseTestFramework) startVolumeServers(config *TestConfig) error { func (f *FuseTestFramework) startVolumeServers(config *TestConfig) error {
args := []string{ args := []string{
"volume", "volume",
"-mserver=" + f.masterAddr,
"-master=" + f.masterAddr,
"-ip=127.0.0.1", "-ip=127.0.0.1",
"-port=18080", "-port=18080",
"-dir=" + filepath.Join(f.dataDir, "volume"), "-dir=" + filepath.Join(f.dataDir, "volume"),

2
test/java/spark/docker-compose.yml
View File

@ -27,7 +27,7 @@ services:
ports: ports:
- "8080:8080" - "8080:8080"
- "18080:18080" - "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: volumes:
- seaweedfs-volume-data:/data - seaweedfs-volume-data:/data
depends_on: depends_on:

2
test/kafka/docker-compose.yml
View File

@ -111,7 +111,7 @@ services:
- "18080:18080" # gRPC port - "18080:18080" # gRPC port
command: command:
- volume - volume
- -mserver=seaweedfs-master:9333
- -master=seaweedfs-master:9333
- -ip=seaweedfs-volume - -ip=seaweedfs-volume
- -port=8080 - -port=8080
- -port.grpc=18080 - -port.grpc=18080

2
test/kafka/kafka-client-loadtest/docker-compose.yml
View File

@ -113,7 +113,7 @@ services:
- "18080:18080" - "18080:18080"
command: command:
- volume - volume
- -mserver=seaweedfs-master:9333
- -master=seaweedfs-master:9333
- -ip=seaweedfs-volume - -ip=seaweedfs-volume
- -port=8080 - -port=8080
- -port.grpc=18080 - -port.grpc=18080

2
test/kms/docker-compose.yml
View File

@ -64,7 +64,7 @@ services:
- "8080:8080" - "8080:8080"
command: command:
- volume - volume
- -mserver=seaweedfs-master:9333
- -master=seaweedfs-master:9333
- -ip=seaweedfs-volume - -ip=seaweedfs-volume
- -publicUrl=seaweedfs-volume:8080 - -publicUrl=seaweedfs-volume:8080
depends_on: depends_on:

2
test/mq/README.md
View File

@ -17,7 +17,7 @@ weed server -mq.broker -mq.agent -filer -volume -master.peers=none
# Or start components separately # Or start components separately
weed master -peers=none weed master -peers=none
weed volume -mserver=localhost:9333
weed volume -master=localhost:9333
weed filer -master=localhost:9333 weed filer -master=localhost:9333
weed mq.broker -filer=localhost:8888 weed mq.broker -filer=localhost:8888
weed mq.agent -brokers=localhost:17777 weed mq.agent -brokers=localhost:17777

2
test/s3/copying/Makefile
View File

@ -74,7 +74,7 @@ start-seaweedfs: check-binary
@sleep 3 @sleep 3
# Start volume server # 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 @sleep 3
# Start filer server (using standard SeaweedFS gRPC port convention: HTTP port + 10000) # Start filer server (using standard SeaweedFS gRPC port convention: HTTP port + 10000)

2
test/s3/iam/Makefile
View File

@ -75,7 +75,7 @@ start-services: ## Start SeaweedFS services for testing
-dataCenter=dc1 -rack=rack1 \ -dataCenter=dc1 -rack=rack1 \
-dir=test-volume-data \ -dir=test-volume-data \
-max=100 \ -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 $$! > $(VOLUME_PID_FILE)
@echo "Waiting for volume server to be ready..." @echo "Waiting for volume server to be ready..."

2
test/s3/iam/docker-compose.test.yml
View File

@ -21,7 +21,7 @@ services:
seaweedfs-volume: seaweedfs-volume:
image: chrislusf/seaweedfs:latest image: chrislusf/seaweedfs:latest
container_name: seaweedfs-volume-test 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: ports:
- "8083:8083" - "8083:8083"
volumes: volumes:

2
test/s3/iam/docker-compose.yml
View File

@ -51,7 +51,7 @@ services:
ports: ports:
- "8083:8083" - "8083:8083"
- "18083:18083" - "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: volumes:
- volume-data:/data - volume-data:/data
networks: networks:

2
test/s3/parquet/Makefile
View File

@ -134,7 +134,7 @@ start-seaweedfs-ci: check-binary
# Start volume server with master HTTP port and increased capacity # Start volume server with master HTTP port and increased capacity
@echo "Starting volume server..." @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 @sleep 5
# Start filer server with embedded S3 # Start filer server with embedded S3

4
test/s3/sse/Makefile
View File

@ -102,7 +102,7 @@ start-seaweedfs: check-binary
@sleep 3 @sleep 3
# Start volume server with master HTTP port and increased capacity # 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 @sleep 5
# Start filer server (using standard SeaweedFS gRPC port convention: HTTP port + 10000) # 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 # Start volume server with master HTTP port and increased capacity
@echo "Starting volume server..." @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 @sleep 5
# Create S3 JSON configuration with KMS (Local provider) and basic identity for embedded S3 # Create S3 JSON configuration with KMS (Local provider) and basic identity for embedded S3

2
test/s3/sse/docker-compose.yml
View File

@ -50,7 +50,7 @@ services:
- "8080:8080" - "8080:8080"
command: command:
- volume - volume
- -mserver=seaweedfs-master:9333
- -master=seaweedfs-master:9333
- -port=8080 - -port=8080
- -ip=seaweedfs-volume - -ip=seaweedfs-volume
- -publicUrl=seaweedfs-volume:8080 - -publicUrl=seaweedfs-volume:8080

2
test/sftp/framework.go
View File

@ -268,7 +268,7 @@ func (f *SftpTestFramework) startMaster(config *TestConfig) error {
func (f *SftpTestFramework) startVolumeServer(config *TestConfig) error { func (f *SftpTestFramework) startVolumeServer(config *TestConfig) error {
args := []string{ args := []string{
"volume", "volume",
"-mserver=" + f.masterAddr,
"-master=" + f.masterAddr,
"-ip=127.0.0.1", "-ip=127.0.0.1",
"-port=18080", "-port=18080",
"-dir=" + filepath.Join(f.dataDir, "volume"), "-dir=" + filepath.Join(f.dataDir, "volume"),

2
weed/storage/volume_vacuum_test.go
View File

@ -17,7 +17,7 @@ makediff test steps
"garbageThreshold" for master and option "max" for volume should be set with specific value which would let "garbageThreshold" for master and option "max" for volume should be set with specific value which would let
preparing test prerequisite easier ) preparing test prerequisite easier )
a) ./weed master -garbageThreshold=0.99 -mdir=./m 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 2. upload 4 different files, you could call dir/assign to get 4 different fids
a) upload file A with fid a a) upload file A with fid a
b) upload file B with fid b b) upload file B with fid b

Write Preview
Loading…
Cancel
Save