diff options
| author | chrislu <chris.lu@gmail.com> | 2024-05-23 08:25:27 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-05-23 08:25:27 -0700 |
| commit | 77a7c5c2a038df73dd1861c5636af9afe8094c84 (patch) | |
| tree | b8090e82706180d0208b25ffc967ccaae80827a0 | |
| parent | d40b350f54753c412d0278348d912a77f89da3d6 (diff) | |
| parent | ba98f02d021d42c106927e623c7c7222ace49921 (diff) | |
| download | seaweedfs-77a7c5c2a038df73dd1861c5636af9afe8094c84.tar.xz seaweedfs-77a7c5c2a038df73dd1861c5636af9afe8094c84.zip | |
Merge branch 'master' into mq
| -rw-r--r-- | k8s/charts/seaweedfs/Chart.yaml | 2 | ||||
| -rw-r--r-- | weed/replication/sink/s3sink/s3_sink.go | 2 | ||||
| -rw-r--r-- | weed/stats/disk_openbsd.go | 27 |
3 files changed, 15 insertions, 16 deletions
diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index 14c877440..b065c326e 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/k8s/charts/seaweedfs/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: SeaweedFS name: seaweedfs appVersion: "3.67" -version: 3.67.0 +version: 3.67.1 diff --git a/weed/replication/sink/s3sink/s3_sink.go b/weed/replication/sink/s3sink/s3_sink.go index 6e7549cdc..279108e16 100644 --- a/weed/replication/sink/s3sink/s3_sink.go +++ b/weed/replication/sink/s3sink/s3_sink.go @@ -1,6 +1,7 @@ package S3Sink import ( + "encoding/base64" "fmt" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" @@ -11,7 +12,6 @@ import ( "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "strconv" "strings" - "encoding/base64" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/stats/disk_openbsd.go b/weed/stats/disk_openbsd.go index 8224e626e..bb03126bf 100644 --- a/weed/stats/disk_openbsd.go +++ b/weed/stats/disk_openbsd.go @@ -4,22 +4,21 @@ package stats import ( - "syscall" + "syscall" - "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" + "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" ) func fillInDiskStatus(disk *volume_server_pb.DiskStatus) { - fs := syscall.Statfs_t{} - err := syscall.Statfs(disk.Dir, &fs) - if err != nil { - return - } - disk.All = fs.F_blocks * uint64(fs.F_bsize) - disk.Free = fs.F_bfree * uint64(fs.F_bsize) - disk.Used = disk.All - disk.Free - disk.PercentFree = float32((float64(disk.Free) / float64(disk.All)) * 100) - disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100) - return + fs := syscall.Statfs_t{} + err := syscall.Statfs(disk.Dir, &fs) + if err != nil { + return + } + disk.All = fs.F_blocks * uint64(fs.F_bsize) + disk.Free = fs.F_bfree * uint64(fs.F_bsize) + disk.Used = disk.All - disk.Free + disk.PercentFree = float32((float64(disk.Free) / float64(disk.All)) * 100) + disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100) + return } - |