backup: replace disk usage percentage threshold (#2231)

Author: aby913

framework/backup-server/.olares/config/cluster/deploy/backup_server.yaml

@@ -1,6 +1,6 @@
 
 
-{{ $backupVersion := "0.3.59" }}
+{{ $backupVersion := "0.3.60" }}
 {{ $backup_server_rootpath := printf "%s%s" .Values.rootPath "/rootfs/backup-server" }}
 
 {{- $backup_nats_secret := (lookup "v1" "Secret" .Release.Namespace "backup-nats-secret") -}}

framework/backup-server/go.mod

@@ -16,7 +16,7 @@ replace (
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
 	k8s.io/kubectl => k8s.io/kubectl v0.24.2
 	k8s.io/utils => k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
-	olares.com/backups-sdk => github.com/Above-Os/backups-sdk v0.1.37
+	olares.com/backups-sdk => github.com/Above-Os/backups-sdk v0.1.38
 	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.12.2
 	sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2
 	sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.11.4

framework/backup-server/go.sum

@@ -31,8 +31,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Above-Os/backups-sdk v0.1.37 h1:7LofG3HRTgGLv0YNjoCFdzSjIhF7PwsYxbmpT2KQkUs=
-github.com/Above-Os/backups-sdk v0.1.37/go.mod h1:55igUShkfGaJZrWJ0z/jlkgkYniZEN/Qoav6njwyvbs=
+github.com/Above-Os/backups-sdk v0.1.38 h1:GUq/sV7Tra0mDCgm9KXfVqsJV8m5rQtIpf7Zx7FFZVg=
+github.com/Above-Os/backups-sdk v0.1.38/go.mod h1:55igUShkfGaJZrWJ0z/jlkgkYniZEN/Qoav6njwyvbs=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=

framework/backup-server/pkg/storage/storage.go

@@ -6,6 +6,5 @@ const (
 )
 
 var (
-	FreeLimit     float64 = 85.00
-	ConnectErrors         = []string{"dial tcp", "connect:"}
+	ConnectErrors = []string{"dial tcp", "connect:"}
 )

framework/backup-server/pkg/storage/storage_backup.go

@@ -25,6 +25,7 @@ import (
 	"olares.com/backup-server/pkg/util/pointer"
 	"olares.com/backup-server/pkg/watchers/notification"
 	backupssdk "olares.com/backups-sdk"
+	backupssdkconstants "olares.com/backups-sdk/pkg/constants"
 	backupssdkoptions "olares.com/backups-sdk/pkg/options"
 	backupssdkrestic "olares.com/backups-sdk/pkg/restic"
 	backupssdkstorage "olares.com/backups-sdk/pkg/storage"
@@ -322,21 +323,16 @@ func (s *StorageBackup) checkDiskSize() error {
 			return err
 		}
 
-		log.Infof("Backup %s,%s, check disk free space: %s, path: %s", backupName, snapshotId, usage.String(), target)
-
-		if usage.UsedPercent > FreeLimit {
-			log.Errorf("Backup %s,%s, disk usage has reached %.2f%%", backupName, snapshotId, FreeLimit)
-			return fmt.Errorf("Disk usage has reached %.2f%%. Please clean up disk space first.", FreeLimit)
-		}
+		log.Infof("Backup %s,%s, check disk free space: %s, path: %s, limit: %d", backupName, snapshotId, usage.String(), target, backupssdkconstants.FreeSpaceLimit)
 
 		backupSize, err := util.DirSize(s.Params.Path)
 		if err != nil {
 			log.Errorf("Backup %s,%s, get backup disk size error: %v, path: %s", backupName, snapshotId, err, s.Params.Path)
 			return fmt.Errorf("get backup disk size error: %v, path: %s", err, s.Params.Path)
 		}
 
-		requiredSpace := uint64(float64(backupSize) * 1.05)
-		if usage.Free < requiredSpace {
+		requiredSpace := backupSize
+		if usage.Free < (requiredSpace + backupssdkconstants.FreeSpaceLimit) {
 			log.Errorf("not enough free space on target disk, required: %s, available: %s, location: %s", util.FormatBytes(requiredSpace), util.FormatBytes(usage.Free), s.Params.LocationInFileSystem)
 			return fmt.Errorf("Insufficient space on the target disk.")
 		}

framework/backup-server/pkg/storage/storage_restore.go

@@ -22,6 +22,7 @@ import (
 	"olares.com/backup-server/pkg/util/pointer"
 	"olares.com/backup-server/pkg/watchers/notification"
 	backupssdk "olares.com/backups-sdk"
+	backupssdkconstants "olares.com/backups-sdk/pkg/constants"
 
 	backupssdkoptions "olares.com/backups-sdk/pkg/options"
 	backupssdkrestic "olares.com/backups-sdk/pkg/restic"
@@ -292,15 +293,10 @@ func (s *StorageRestore) checkDiskSize() error {
 		return err
 	}
 
-	log.Infof("Restore %s, check disk free space: %s, path: %s", s.RestoreId, usage.String(), s.Params.RootPath)
+	log.Infof("Restore %s, check disk free space: %s, path: %s, limit: %d", s.RestoreId, usage.String(), s.Params.RootPath, backupssdkconstants.FreeSpaceLimit)
 
-	if usage.UsedPercent > FreeLimit {
-		log.Errorf("Restore %s, disk usage has reached %.2f%%", s.RestoreId, FreeLimit)
-		return fmt.Errorf("Disk usage has reached %.2f%%. Please clean up disk space first.", FreeLimit)
-	}
-
-	requiredSpace := uint64(float64(s.RestoreType.TotalBytesProcessed) * 1.05)
-	if usage.Free < requiredSpace {
+	requiredSpace := uint64(s.RestoreType.TotalBytesProcessed)
+	if usage.Free < (requiredSpace + backupssdkconstants.FreeSpaceLimit) {
 		log.Errorf("not enough free space on target disk, required: %s, available: %s, location: %s", util.FormatBytes(requiredSpace), util.FormatBytes(usage.Free), s.Params.RootPath)
 		return fmt.Errorf("Insufficient space on the target disk.")
 	}