refacrot GetDirectorySize and preallocation

Signed-off-by: Nikita Korolev <[email protected]>

Author: universal-itengineer

images/cdi-cloner/cloner-startup/cmd/cloner-startup/main.go

@@ -25,6 +25,8 @@ import (
 )
 
 func main() {
+	var uploadBytes uint64
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
 	slog.SetDefault(logger)
 
@@ -61,6 +63,8 @@ func main() {
 			os.Exit(1)
 		}
 
+		logger.Info(fmt.Sprintf("Start clone block with %s", helpers.FormatBytes(float64(uploadBytes))))
+
 		if err = helpers.RunCloner("blockdevice-clone", uploadBytes, mountPoint); err != nil {
 			logger.Error("Error running cdi-cloner: %v\n", slog.String("error", err.Error()))
 			os.Exit(1)
@@ -73,38 +77,22 @@ func main() {
 			os.Exit(1)
 		}
 
-		// TODO correct log message
-		if preallocation {
-			logger.Info("Get only used blocks in bytes")
-		} else {
-			logger.Info("Preallocating filesystem, uploading all bytes")
-		}
-		// directory bytes, directory bytes
-		// total count bytes, used count bytes
-		// uploadBytes, err := helpers.GetDirectorySize(".", preallocation)
 		totalBytes, totalUsedBytes, err := helpers.GetDirectorySize(".")
 		if err != nil {
 			logger.Error("Directory size calculation failed: %v\n", slog.String("error", err.Error()))
 			os.Exit(1)
 		}
 
-		/*
-			if preallocation {
-				uploadBytes := totalUsedBytes
-			}else
-			{
-				uploadBytes := totalBytes
-			}
-		*/
-		var uploadBytes uint64
-
 		if preallocation {
-			uploadBytes = totalUsedBytes
-		} else {
 			uploadBytes = totalBytes
+			logger.Info("Preallocating filesystem, uploading all bytes")
+		} else {
+			uploadBytes = totalUsedBytes
+			logger.Info("Not preallocating filesystem, get only used blocks in bytes")
 		}
 
 		logger.Info(fmt.Sprintf("Start clone with %d bytes", uploadBytes))
+		logger.Info(fmt.Sprintf("Start clone with %s", helpers.FormatBytes(float64(uploadBytes))))
 
 		if err = helpers.RunCloner("filesystem-clone", uploadBytes, mountPoint); err != nil {
 			logger.Error("Error running cdi-cloner: %v\n", slog.String("error", err.Error()))

images/cdi-cloner/cloner-startup/internal/helpers/size.go

@@ -64,11 +64,11 @@ func GetBlockDeviceSize(device string) (uint64, error) {
 	return size, nil
 }
 
-// GetDirectorySize calculates directory size using Go's filepath.Walk
-// func GetDirectorySize(path string, usedBlocks bool) (uint64, uint64, error) {
+// Calculates directory size using Go's filepath.Walk
+//
+// return totalBytes and totalUsedBytes(Blocks * Blksize)
 func GetDirectorySize(path string) (uint64, uint64, error) {
 	var (
-		// total          uint64
 		totalBytes     uint64
 		totalUsedBytes uint64
 	)
@@ -83,18 +83,27 @@ func GetDirectorySize(path string) (uint64, uint64, error) {
 		if stat, ok := info.Sys().(*syscall.Stat_t); ok {
 			totalUsedBytes += uint64(stat.Blocks * int64(stat.Blksize))
 		}
-
-		// if usedBlocks {
-		// 	// only used blocks
-		// 	if stat, ok := info.Sys().(*syscall.Stat_t); ok {
-		// 		total += uint64(stat.Blocks * int64(stat.Blksize))
-		// 	}
-		// } else {
-		// 	// all bytes
-		// 	total += uint64(info.Size())
-		// }
 		return nil
 	})
 	return totalBytes, totalUsedBytes, err
-	// return total, err
+}
+
+// Convert byte size to human readable format
+func FormatBytes(s float64) string {
+	var base float64 = 1024.0
+	sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB"}
+
+	unitsLimit := len(sizes)
+	i := 0
+	for s >= base && i < unitsLimit {
+		s = s / base
+		i++
+	}
+
+	f := "%.0f %s"
+	if i > 1 {
+		f = "%.2f %s"
+	}
+
+	return fmt.Sprintf(f, s, sizes[i])
 }