add DiskSize log formatter

for both readability and accuracy.

pkg/disk/nodeserver.go

@@ -961,8 +961,8 @@ func (ns *nodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandV
 				if bytes.Contains(output, []byte("it cannot be grown")) || bytes.Contains(output, []byte("could only be grown by")) {
 					deviceCapacity := getBlockDeviceCapacity(devicePath)
 					rootCapacity := getBlockDeviceCapacity(rootPath)
-					log.Infof("NodeExpandVolume: Volume %s with Device Partition %s no need to grown, with requestSize: %d, rootBlockSize: %d, partition BlockDevice size: %d",
-						diskID, devicePath, requestBytes, rootCapacity, deviceCapacity)
+					log.Infof("NodeExpandVolume: Volume %s with Device Partition %s no need to grown, with request: %v, root: %v, partition: %v",
+						diskID, devicePath, DiskSize{requestBytes}, DiskSize{rootCapacity}, DiskSize{deviceCapacity})
 					return &csi.NodeExpandVolumeResponse{}, nil
 				}
 			}
@@ -999,7 +999,7 @@ func (ns *nodeServer) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandV
 		return nil, status.Errorf(codes.Aborted, "requested %v, but actual block size %v is smaller. Not updated yet?",
 			resource.NewQuantity(requestBytes, resource.BinarySI), resource.NewQuantity(deviceCapacity, resource.BinarySI))
 	}
-	log.Infof("NodeExpandVolume:: Expand %s to %d bytes successful", diskID, deviceCapacity)
+	log.Infof("NodeExpandVolume:: Expand %s to %v successful", diskID, DiskSize{deviceCapacity})
 	return &csi.NodeExpandVolumeResponse{
 		CapacityBytes: deviceCapacity,
 	}, nil

pkg/disk/utils.go

@@ -1684,3 +1684,16 @@ func createStaticSnap(volumeID, snapshotID string, snapClient snapClientset.Inte
 	}
 	return nil
 }
+
+// Logging disk block device size
+type DiskSize struct {
+	Bytes int64
+}
+
+func (d DiskSize) String() string {
+	// Alibaba cloud disks are at least in the order of GiB
+	if d.Bytes%GBSIZE == 0 {
+		return fmt.Sprintf("%d GiB", d.Bytes/GBSIZE)
+	}
+	return fmt.Sprintf("%.3f GiB (0x%X)", float64(d.Bytes)/GBSIZE, d.Bytes)
+}

pkg/disk/utils_test.go

@@ -522,3 +522,13 @@ func TestCheckDeviceAvailableError(t *testing.T) {
 		t.Errorf("expected os.ErrNotExist, got %v", err)
 	}
 }
+
+func TestDiskSize(t *testing.T) {
+	size := DiskSize{22014345216}
+	assert.Equal(t, "20.502 GiB (0x520284000)", size.String())
+}
+
+func TestDiskSizeGiOnly(t *testing.T) {
+	size := DiskSize{20 * GBSIZE}
+	assert.Equal(t, "20 GiB", size.String())
+}