diff options
| -rw-r--r-- | k8s/helm_charts2/templates/filer-servicemonitor.yaml | 2 | ||||
| -rw-r--r-- | k8s/helm_charts2/templates/ingress.yaml | 2 | ||||
| -rw-r--r-- | k8s/helm_charts2/templates/s3-servicemonitor.yaml | 2 | ||||
| -rw-r--r-- | k8s/helm_charts2/templates/volume-servicemonitor.yaml | 2 | ||||
| -rw-r--r-- | weed/command/filer_copy.go | 62 |
5 files changed, 42 insertions, 28 deletions
diff --git a/k8s/helm_charts2/templates/filer-servicemonitor.yaml b/k8s/helm_charts2/templates/filer-servicemonitor.yaml index f07f6ebef..ed45442dc 100644 --- a/k8s/helm_charts2/templates/filer-servicemonitor.yaml +++ b/k8s/helm_charts2/templates/filer-servicemonitor.yaml @@ -1,4 +1,5 @@ {{- if .Values.filer.metricsPort }} +{{- if .Values.global.monitoring.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -15,4 +16,5 @@ spec: selector: app: {{ template "seaweedfs.name" . }} component: filer +{{- end }} {{- end }}
\ No newline at end of file diff --git a/k8s/helm_charts2/templates/ingress.yaml b/k8s/helm_charts2/templates/ingress.yaml index dcd52c138..4f1b4251d 100644 --- a/k8s/helm_charts2/templates/ingress.yaml +++ b/k8s/helm_charts2/templates/ingress.yaml @@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-filer + namespace: {{ .Release.Namespace }} annotations: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-type: "basic" @@ -32,6 +33,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: ingress-{{ template "seaweedfs.name" . }}-master + namespace: {{ .Release.Namespace }} annotations: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/auth-type: "basic" diff --git a/k8s/helm_charts2/templates/s3-servicemonitor.yaml b/k8s/helm_charts2/templates/s3-servicemonitor.yaml index 7f18f00f5..b549893c7 100644 --- a/k8s/helm_charts2/templates/s3-servicemonitor.yaml +++ b/k8s/helm_charts2/templates/s3-servicemonitor.yaml @@ -1,4 +1,5 @@ {{- if .Values.s3.metricsPort }} +{{- if .Values.global.monitoring.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -15,4 +16,5 @@ spec: selector: app: {{ template "seaweedfs.name" . }} component: s3 +{{- end }} {{- end }}
\ No newline at end of file diff --git a/k8s/helm_charts2/templates/volume-servicemonitor.yaml b/k8s/helm_charts2/templates/volume-servicemonitor.yaml index 1b286e9b6..90d70e8de 100644 --- a/k8s/helm_charts2/templates/volume-servicemonitor.yaml +++ b/k8s/helm_charts2/templates/volume-servicemonitor.yaml @@ -1,4 +1,5 @@ {{- if .Values.volume.metricsPort }} +{{- if .Values.global.monitoring.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -15,4 +16,5 @@ spec: selector: app: {{ template "seaweedfs.name" . }} component: volume +{{- end }} {{- end }}
\ No newline at end of file diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index 0feae63b3..2f3b69da6 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -344,9 +344,9 @@ func (worker *FileCopyWorker) uploadFileAsOne(task FileCopyTask, f *os.File) err return err } - // assign a volume - err = util.Retry("assignVolume", func() error { - return pb.WithGrpcFilerClient(worker.filerAddress, worker.options.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { + err = util.Retry("upload", func() error { + // assign a volume + assignErr := pb.WithGrpcFilerClient(worker.filerAddress, worker.options.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { request := &filer_pb.AssignVolumeRequest{ Count: 1, @@ -369,35 +369,41 @@ func (worker *FileCopyWorker) uploadFileAsOne(task FileCopyTask, f *os.File) err } return nil }) - }) - if err != nil { - return fmt.Errorf("Failed to assign from %v: %v\n", worker.options.masters, err) - } + if assignErr != nil { + return assignErr + } - targetUrl := "http://" + assignResult.Location.Url + "/" + assignResult.FileId - uploadOption := &operation.UploadOption{ - UploadUrl: targetUrl, - Filename: fileName, - Cipher: worker.options.cipher, - IsInputCompressed: false, - MimeType: mimeType, - PairMap: nil, - Jwt: security.EncodedJwt(assignResult.Auth), - } - uploadResult, err := operation.UploadData(data, uploadOption) + // upload data + targetUrl := "http://" + assignResult.Location.Url + "/" + assignResult.FileId + uploadOption := &operation.UploadOption{ + UploadUrl: targetUrl, + Filename: fileName, + Cipher: worker.options.cipher, + IsInputCompressed: false, + MimeType: mimeType, + PairMap: nil, + Jwt: security.EncodedJwt(assignResult.Auth), + } + uploadResult, err := operation.UploadData(data, uploadOption) + if err != nil { + return fmt.Errorf("upload data %v to %s: %v\n", fileName, targetUrl, err) + } + if uploadResult.Error != "" { + return fmt.Errorf("upload %v to %s result: %v\n", fileName, targetUrl, uploadResult.Error) + } + if *worker.options.verbose { + fmt.Printf("uploaded %s to %s\n", fileName, targetUrl) + } + + fmt.Printf("copied %s => http://%s%s%s\n", f.Name(), worker.filerAddress.ToHttpAddress(), task.destinationUrlPath, fileName) + chunks = append(chunks, uploadResult.ToPbFileChunk(assignResult.FileId, 0)) + + return nil + }) if err != nil { - return fmt.Errorf("upload data %v to %s: %v\n", fileName, targetUrl, err) - } - if uploadResult.Error != "" { - return fmt.Errorf("upload %v to %s result: %v\n", fileName, targetUrl, uploadResult.Error) + return fmt.Errorf("upload %v: %v\n", fileName, err) } - if *worker.options.verbose { - fmt.Printf("uploaded %s to %s\n", fileName, targetUrl) - } - - chunks = append(chunks, uploadResult.ToPbFileChunk(assignResult.FileId, 0)) - fmt.Printf("copied %s => http://%s%s%s\n", f.Name(), worker.filerAddress.ToHttpAddress(), task.destinationUrlPath, fileName) } if err := pb.WithGrpcFilerClient(worker.filerAddress, worker.options.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { |