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

Merge branch 'master' into mq

pull/5890/head
chrislu 7 months ago
parent
554ae09f82 9497db71e6
commit
73d008fafa
6 changed files with 75 additions and 15 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. 14
      k8s/charts/seaweedfs/templates/filer-statefulset.yaml
  2. 18
      k8s/charts/seaweedfs/templates/master-statefulset.yaml
  3. 8
      k8s/charts/seaweedfs/templates/s3-deployment.yaml
  4. 12
      k8s/charts/seaweedfs/templates/volume-statefulset.yaml
  5. 35
      k8s/charts/seaweedfs/values.yaml
  6. 3
      weed/shell/command_fs_meta_load.go

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

@ -129,7 +129,7 @@ spec:
- "-ec" - "-ec"
- | - |
exec /usr/bin/weed \ exec /usr/bin/weed \
{{- if eq .Values.filer.logs.type "hostPath" }}
{{- if or (eq .Values.filer.logs.type "hostPath") (eq .Values.filer.logs.type "emptyDir") }}
-logdir=/logs \ -logdir=/logs \
{{- else }} {{- else }}
-logtostderr=true \ -logtostderr=true \
@ -197,7 +197,7 @@ spec:
{{- 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={{ 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 }}
volumeMounts: volumeMounts:
{{- if eq .Values.filer.logs.type "hostPath" }}
{{- if or (eq .Values.filer.logs.type "hostPath") (eq .Values.filer.logs.type "emptyDir") }}
- name: seaweedfs-filer-log-volume - name: seaweedfs-filer-log-volume
mountPath: "/logs/" mountPath: "/logs/"
{{- end }} {{- end }}
@ -206,7 +206,7 @@ spec:
mountPath: /etc/sw mountPath: /etc/sw
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if (or .Values.filer.enablePVC (or (eq .Values.filer.data.type "hostPath") (eq .Values.filer.data.type "persistentVolumeClaim"))) }}
{{- if (or .Values.filer.enablePVC (or (eq .Values.filer.data.type "hostPath") (eq .Values.filer.data.type "persistentVolumeClaim") (eq .Values.filer.data.type "emptyDir"))) }}
- name: data-filer - name: data-filer
mountPath: /data mountPath: /data
{{- end }} {{- end }}
@ -285,6 +285,10 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.filer.logs.claimName }} claimName: {{ .Values.filer.logs.claimName }}
{{- end }} {{- end }}
{{- if eq .Values.filer.logs.type "emptyDir" }}
- name: seaweedfs-filer-log-volume
emptyDir: {}
{{- end }}
{{- if eq .Values.filer.data.type "hostPath" }} {{- if eq .Values.filer.data.type "hostPath" }}
- name: data-filer - name: data-filer
hostPath: hostPath:
@ -296,6 +300,10 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.filer.data.claimName }} claimName: {{ .Values.filer.data.claimName }}
{{- end }} {{- end }}
{{- if eq .Values.filer.data.type "emptyDir" }}
- name: data-filer
emptyDir: {}
{{- end }}
- name: db-schema-config-volume - name: db-schema-config-volume
configMap: configMap:
name: seaweedfs-db-init-config name: seaweedfs-db-init-config

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

@ -108,9 +108,9 @@ spec:
command: command:
- "/bin/sh" - "/bin/sh"
- "-ec" - "-ec"
- |
- |
exec /usr/bin/weed \ exec /usr/bin/weed \
{{- if eq .Values.master.logs.type "hostPath" }}
{{- if or (eq .Values.master.logs.type "hostPath") (eq .Values.master.logs.type "emptyDir") }}
-logdir=/logs \ -logdir=/logs \
{{- else }} {{- else }}
-logtostderr=true \ -logtostderr=true \
@ -158,7 +158,7 @@ spec:
volumeMounts: volumeMounts:
- name : data-{{ .Release.Namespace }} - name : data-{{ .Release.Namespace }}
mountPath: /data mountPath: /data
{{- if eq .Values.master.logs.type "hostPath" }}
{{- if or (eq .Values.master.logs.type "hostPath") (eq .Values.master.logs.type "emptyDir") }}
- name: seaweedfs-master-log-volume - name: seaweedfs-master-log-volume
mountPath: "/logs/" mountPath: "/logs/"
{{- end }} {{- end }}
@ -241,7 +241,11 @@ spec:
{{- if eq .Values.master.logs.type "existingClaim" }} {{- if eq .Values.master.logs.type "existingClaim" }}
- name: seaweedfs-master-log-volume - name: seaweedfs-master-log-volume
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.master.logs.claimName }}
claimName: {{ .Values.master.logs.claimName }}
{{- end }}
{{- if eq .Values.master.logs.type "emptyDir" }}
- name: seaweedfs-master-log-volume
emptyDir: {}
{{- end }} {{- end }}
{{- if eq .Values.master.data.type "hostPath" }} {{- if eq .Values.master.data.type "hostPath" }}
- name: data-{{ .Release.Namespace }} - name: data-{{ .Release.Namespace }}
@ -252,7 +256,11 @@ spec:
{{- if eq .Values.master.data.type "existingClaim" }} {{- if eq .Values.master.data.type "existingClaim" }}
- name: data-{{ .Release.Namespace }} - name: data-{{ .Release.Namespace }}
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.master.data.claimName }}
claimName: {{ .Values.master.data.claimName }}
{{- end }}
{{- if eq .Values.master.data.type "emptyDir" }}
- name: data-{{ .Release.Namespace }}
emptyDir: {}
{{- end }} {{- end }}
- name: master-config - name: master-config
configMap: configMap:

8
k8s/charts/seaweedfs/templates/s3-deployment.yaml
View File

@ -99,7 +99,7 @@ spec:
- "-ec" - "-ec"
- | - |
exec /usr/bin/weed \ exec /usr/bin/weed \
{{- if eq .Values.s3.logs.type "hostPath" }}
{{- if or (eq .Values.s3.logs.type "hostPath") (eq .Values.s3.logs.type "emptyDir") }}
-logdir=/logs \ -logdir=/logs \
{{- else }} {{- else }}
-logtostderr=true \ -logtostderr=true \
@ -136,7 +136,7 @@ spec:
{{- end }} {{- end }}
-filer={{ template "seaweedfs.name" . }}-filer-client.{{ .Release.Namespace }}:{{ .Values.filer.port }} -filer={{ template "seaweedfs.name" . }}-filer-client.{{ .Release.Namespace }}:{{ .Values.filer.port }}
volumeMounts: volumeMounts:
{{- if eq .Values.s3.logs.type "hostPath" }}
{{- if or (eq .Values.s3.logs.type "hostPath") (eq .Values.s3.logs.type "emptyDir") }}
- name: logs - name: logs
mountPath: "/logs/" mountPath: "/logs/"
{{- end }} {{- end }}
@ -225,6 +225,10 @@ spec:
path: {{ .Values.s3.logs.hostPathPrefix }}/logs/seaweedfs/s3 path: {{ .Values.s3.logs.hostPathPrefix }}/logs/seaweedfs/s3
type: DirectoryOrCreate type: DirectoryOrCreate
{{- end }} {{- end }}
{{- if eq .Values.s3.logs.type "emptyDir" }}
- name: logs
emptyDir: {}
{{- end }}
{{- if .Values.global.enableSecurity }} {{- if .Values.global.enableSecurity }}
- name: security-config - name: security-config
configMap: configMap:

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

@ -261,6 +261,10 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ $dir.claimName }} claimName: {{ $dir.claimName }}
{{- end }} {{- end }}
{{- if eq $dir.type "emptyDir" }}
- name: {{ $dir.name }}
emptyDir: {}
{{- end }}
{{- end }} {{- end }}
@ -276,6 +280,10 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.volume.idx.claimName }} claimName: {{ .Values.volume.idx.claimName }}
{{- end }} {{- end }}
{{- if eq .Values.volume.idx.type "emptyDir" }}
- name: idx
emptyDir: {}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.volume.logs }} {{- if .Values.volume.logs }}
@ -290,6 +298,10 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.volume.logs.claimName }} claimName: {{ .Values.volume.logs.claimName }}
{{- end }} {{- end }}
{{- if eq .Values.volume.logs.type "emptyDir" }}
- name: logs
emptyDir: {}
{{- end }}
{{- end }} {{- end }}
{{- if .Values.global.enableSecurity }} {{- if .Values.global.enableSecurity }}
- name: security-config - name: security-config

35
k8s/charts/seaweedfs/values.yaml
View File

@ -93,11 +93,18 @@ master:
# data: # data:
# type: "existingClaim" # type: "existingClaim"
# claimName: "my-pvc" # claimName: "my-pvc"
#
# You can also use emptyDir storage:
# data:
# type: "emptyDir"
data: data:
type: "hostPath" type: "hostPath"
storageClass: "" storageClass: ""
hostPathPrefix: /ssd hostPathPrefix: /ssd
# You can also use emptyDir storage:
# logs:
# type: "emptyDir"
logs: logs:
type: "hostPath" type: "hostPath"
size: "" size: ""
@ -275,9 +282,14 @@ volume:
# maxVolumes: 0 # If set to zero on non-windows OS, the limit will be auto configured. (default "7") # maxVolumes: 0 # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
# #
# You may also spacify an existing claim: # You may also spacify an existing claim:
# - name: data
# type: "existingClaim"
# claimName: "my-pvc"
# - name: data
# type: "existingClaim"
# claimName: "my-pvc"
# maxVolumes: 0 # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
#
# You can also use emptyDir storage:
# - name: data
# type: "emptyDir"
# maxVolumes: 0 # If set to zero on non-windows OS, the limit will be auto configured. (default "7") # maxVolumes: 0 # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
dataDirs: dataDirs:
@ -310,6 +322,11 @@ volume:
# idx: # idx:
# type: "existingClaim" # type: "existingClaim"
# claimName: "myClaim" # claimName: "myClaim"
#
# or
#
# idx:
# type: "emptyDir"
# same applies to "logs" # same applies to "logs"
@ -499,12 +516,19 @@ filer:
# data: # data:
# type: "existingClaim" # type: "existingClaim"
# claimName: "my-pvc" # claimName: "my-pvc"
#
# You can also use emptyDir storage:
# data:
# type: "emptyDir"
data: data:
type: "hostPath" type: "hostPath"
size: "" size: ""
storageClass: "" storageClass: ""
hostPathPrefix: /storage hostPathPrefix: /storage
# You can also use emptyDir storage:
# logs:
# type: "emptyDir"
logs: logs:
type: "hostPath" type: "hostPath"
size: "" size: ""
@ -741,7 +765,7 @@ s3:
# should map directly to the value of the resources field for a PodSpec, # should map directly to the value of the resources field for a PodSpec,
# formatted as a multi-line string. By default no direct resource request # formatted as a multi-line string. By default no direct resource request
# is made. # is made.
resources: {}
resources: null
# Toleration Settings for server pods # Toleration Settings for server pods
# This should be a multi-line string matching the Toleration array # This should be a multi-line string matching the Toleration array
@ -783,6 +807,9 @@ s3:
# allowPrivilegeEscalation: false # allowPrivilegeEscalation: false
containerSecurityContext: {} containerSecurityContext: {}
# You can also use emptyDir storage:
# logs:
# type: "emptyDir"
logs: logs:
type: "hostPath" type: "hostPath"
size: "" size: ""

3
weed/shell/command_fs_meta_load.go
View File

@ -32,7 +32,8 @@ func (c *commandFsMetaLoad) Help() string {
fs.meta.load <filer_host>-<port>-<time>.meta fs.meta.load <filer_host>-<port>-<time>.meta
fs.meta.load -v=false <filer_host>-<port>-<time>.meta // skip printing out the verbose output fs.meta.load -v=false <filer_host>-<port>-<time>.meta // skip printing out the verbose output
fs.meta.load -dirPrefix=/buckets/important* <filer_host>.meta // load any dirs with prefix "important"
fs.meta.load -concurrency=1 <filer_host>-<port>-<time>.meta // number of parallel meta load to filer
fs.meta.load -dirPrefix=/buckets/important <filer_host>.meta // load any dirs with prefix "important"
` `
} }

Write Preview
Loading…
Cancel
Save