Merge branch 'master' into mq

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

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"

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{}
+	fs := syscall.Statfs_t{}
-    err := syscall.Statfs(disk.Dir, &fs)
+	err := syscall.Statfs(disk.Dir, &fs)
-    if err != nil {
+	if err != nil {
-        return
+		return
-    }
+	}
-    disk.All = fs.F_blocks * uint64(fs.F_bsize)
+	disk.All = fs.F_blocks * uint64(fs.F_bsize)
-    disk.Free = fs.F_bfree * uint64(fs.F_bsize)
+	disk.Free = fs.F_bfree * uint64(fs.F_bsize)
-    disk.Used = disk.All - disk.Free
+	disk.Used = disk.All - disk.Free
-    disk.PercentFree = float32((float64(disk.Free) / float64(disk.All)) * 100)
+	disk.PercentFree = float32((float64(disk.Free) / float64(disk.All)) * 100)
-    disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100)
+	disk.PercentUsed = float32((float64(disk.Used) / float64(disk.All)) * 100)
-    return
+	return
 }
-