Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add real size to backing image #3104

Merged
merged 1 commit into from
Oct 7, 2024
Merged

feat: add real size to backing image #3104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions controller/backing_image_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ func (bic *BackingImageController) syncBackingImageFileInfo(bi *longhorn.Backing
if bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].State != longhorn.BackingImageStateFailed {
msg := fmt.Sprintf("found mismatching size %v reported by backing image manager %v in disk %v, the size recorded in status is %v",
info.Size, bim.Name, bim.Spec.DiskUUID, bi.Status.Size)
log.Error(msg)
bic.eventRecorder.Eventf(bi, corev1.EventTypeWarning, constant.EventReasonUpdate, msg)
bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].State = longhorn.BackingImageStateFailed
bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].Message = msg
}
Expand All @@ -834,7 +834,22 @@ func (bic *BackingImageController) syncBackingImageFileInfo(bi *longhorn.Backing
if bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].State != longhorn.BackingImageStateFailed {
msg := fmt.Sprintf("found mismatching virtualSize %v reported by backing image manager %v in disk %v, the virtualSize recorded in status is %v",
info.VirtualSize, bim.Name, bim.Spec.DiskUUID, bi.Status.VirtualSize)
log.Error(msg)
bic.eventRecorder.Eventf(bi, corev1.EventTypeWarning, constant.EventReasonUpdate, msg)
bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].State = longhorn.BackingImageStateFailed
bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].Message = msg
}
}
}
if info.RealSize > 0 {
if bi.Status.RealSize == 0 {
bi.Status.RealSize = info.RealSize
bic.eventRecorder.Eventf(bi, corev1.EventTypeNormal, constant.EventReasonUpdate, "Set realSize to %v", bi.Status.RealSize)
ChanYiLin marked this conversation as resolved.
Show resolved Hide resolved
}
if bi.Status.RealSize != info.RealSize {
if bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].State != longhorn.BackingImageStateFailed {
msg := fmt.Sprintf("found mismatching realSize %v reported by backing image manager %v in disk %v, the realSize recorded in status is %v",
info.RealSize, bim.Name, bim.Spec.DiskUUID, bi.Status.RealSize)
bic.eventRecorder.Eventf(bi, corev1.EventTypeWarning, constant.EventReasonUpdate, msg)
bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].State = longhorn.BackingImageStateFailed
bi.Status.DiskFileStatusMap[bim.Spec.DiskUUID].Message = msg
}
Expand Down
17 changes: 17 additions & 0 deletions controller/node_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,10 @@ func (nc *NodeController) updateDiskStatusSchedulableCondition(node *longhorn.No
if err != nil {
return err
}
backingImages, err := nc.ds.ListBackingImagesRO()
if err != nil {
return err
}

for diskName, disk := range node.Spec.Disks {
diskStatus := diskStatusMap[diskName]
Expand Down Expand Up @@ -851,6 +855,7 @@ func (nc *NodeController) updateDiskStatusSchedulableCondition(node *longhorn.No
return err
}
scheduledReplica := map[string]int64{}
scheduledBackingImage := map[string]int64{}
storageScheduled := int64(0)
for _, replica := range replicas {
if replica.Spec.NodeID != node.Name || replica.Spec.DiskPath != disk.Path {
Expand All @@ -865,8 +870,17 @@ func (nc *NodeController) updateDiskStatusSchedulableCondition(node *longhorn.No
storageScheduled += replica.Spec.VolumeSize
scheduledReplica[replica.Name] = replica.Spec.VolumeSize
}

for _, backingImage := range backingImages {
if _, exists := backingImage.Spec.DiskFileSpecMap[diskStatus.DiskUUID]; exists {
storageScheduled += backingImage.Status.RealSize
scheduledBackingImage[backingImage.Name] = backingImage.Status.RealSize
}
}

diskStatus.StorageScheduled = storageScheduled
diskStatus.ScheduledReplica = scheduledReplica
diskStatus.ScheduledBackingImage = scheduledBackingImage
// check disk pressure
info, err := nc.scheduler.GetDiskSchedulingInfo(disk, diskStatus)
if err != nil {
Expand Down Expand Up @@ -1676,6 +1690,9 @@ func (nc *NodeController) alignDiskSpecAndStatus(node *longhorn.Node) {
if diskStatus.ScheduledReplica == nil {
diskStatus.ScheduledReplica = map[string]int64{}
}
if diskStatus.ScheduledBackingImage == nil {
diskStatus.ScheduledBackingImage = map[string]int64{}
}
// When condition are not ready, the old storage data should be cleaned.
diskStatus.StorageMaximum = 0
diskStatus.StorageAvailable = 0
Expand Down
73 changes: 39 additions & 34 deletions controller/node_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,12 +589,13 @@ func (s *NodeControllerSuite) TestUpdateDiskStatus(c *C) {
ScheduledReplica: map[string]int64{
fixture.lhReplicas[0].Name: fixture.lhReplicas[0].Spec.VolumeSize,
},
DiskName: TestDiskID1,
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
ScheduledBackingImage: map[string]int64{},
DiskName: TestDiskID1,
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
},
},
},
Expand Down Expand Up @@ -739,13 +740,14 @@ func (s *NodeControllerSuite) TestCleanDiskStatus(c *C) {
newNodeCondition(longhorn.DiskConditionTypeSchedulable, longhorn.ConditionStatusFalse, string(longhorn.DiskConditionReasonDiskPressure)),
newNodeCondition(longhorn.DiskConditionTypeReady, longhorn.ConditionStatusTrue, ""),
},
ScheduledReplica: map[string]int64{},
DiskName: TestDiskID1,
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
ScheduledReplica: map[string]int64{},
ScheduledBackingImage: map[string]int64{},
DiskName: TestDiskID1,
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
},
},
},
Expand Down Expand Up @@ -897,13 +899,14 @@ func (s *NodeControllerSuite) TestDisableDiskOnFilesystemChange(c *C) {
newNodeCondition(longhorn.DiskConditionTypeSchedulable, longhorn.ConditionStatusFalse, string(longhorn.DiskConditionReasonDiskNotReady)),
newNodeCondition(longhorn.DiskConditionTypeReady, longhorn.ConditionStatusFalse, string(longhorn.DiskConditionReasonDiskFilesystemChanged)),
},
ScheduledReplica: map[string]int64{},
DiskName: TestDiskID1,
DiskUUID: "new-uuid",
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
ScheduledReplica: map[string]int64{},
ScheduledBackingImage: map[string]int64{},
DiskName: TestDiskID1,
DiskUUID: "new-uuid",
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
},
},
},
Expand Down Expand Up @@ -1026,13 +1029,14 @@ func (s *NodeControllerSuite) TestCreateDefaultInstanceManager(c *C) {
newNodeCondition(longhorn.DiskConditionTypeSchedulable, longhorn.ConditionStatusFalse, string(longhorn.DiskConditionReasonDiskPressure)),
newNodeCondition(longhorn.DiskConditionTypeReady, longhorn.ConditionStatusTrue, ""),
},
DiskName: TestDiskID1,
ScheduledReplica: map[string]int64{},
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
DiskName: TestDiskID1,
ScheduledReplica: map[string]int64{},
ScheduledBackingImage: map[string]int64{},
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
},
},
},
Expand Down Expand Up @@ -1172,13 +1176,14 @@ func (s *NodeControllerSuite) TestCleanupRedundantInstanceManagers(c *C) {
newNodeCondition(longhorn.DiskConditionTypeSchedulable, longhorn.ConditionStatusFalse, string(longhorn.DiskConditionReasonDiskPressure)),
newNodeCondition(longhorn.DiskConditionTypeReady, longhorn.ConditionStatusTrue, ""),
},
DiskName: TestDiskID1,
ScheduledReplica: map[string]int64{},
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
DiskName: TestDiskID1,
ScheduledReplica: map[string]int64{},
ScheduledBackingImage: map[string]int64{},
DiskUUID: TestDiskID1,
Type: longhorn.DiskTypeFilesystem,
FSType: TestDiskPathFSType,
DiskPath: TestDefaultDataPath,
InstanceManagerName: TestInstanceManagerName,
},
},
},
Expand Down
1 change: 1 addition & 0 deletions engineapi/backing_image_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (c *BackingImageManagerClient) parseBackingImageFileInfo(bi *bimapi.Backing
UUID: bi.UUID,
Size: bi.Size,
VirtualSize: bi.VirtualSize,
RealSize: bi.RealSize,

State: longhorn.BackingImageState(bi.Status.State),
CurrentChecksum: bi.Status.CurrentChecksum,
Expand Down
14 changes: 14 additions & 0 deletions k8s/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ spec:
type: string
progress:
type: integer
realSize:
format: int64
type: integer
senderManagerAddress:
type: string
sendingReference:
Expand Down Expand Up @@ -560,6 +563,11 @@ spec:
type: object
ownerID:
type: string
realSize:
description: Real size of image, which may be smaller than the size
when the file is a sparse file. Will be zero until known (e.g. while a backing image is uploading)
format: int64
type: integer
size:
format: int64
type: integer
Expand Down Expand Up @@ -2507,6 +2515,12 @@ spec:
type: string
instanceManagerName:
type: string
scheduledBackingImage:
additionalProperties:
format: int64
type: integer
nullable: true
type: object
scheduledReplica:
additionalProperties:
format: int64
Expand Down
3 changes: 3 additions & 0 deletions k8s/pkg/apis/longhorn/v1beta2/backingimage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ type BackingImageStatus struct {
// Virtual size of image, which may be larger than physical size. Will be zero until known (e.g. while a backing image is uploading)
// +optional
VirtualSize int64 `json:"virtualSize"`
// Real size of image, which may be smaller than the size when the file is a sparse file. Will be zero until known (e.g. while a backing image is uploading)
// +optional
RealSize int64 `json:"realSize"`
// +optional
Checksum string `json:"checksum"`
// +optional
Expand Down
2 changes: 2 additions & 0 deletions k8s/pkg/apis/longhorn/v1beta2/backingimagemanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type BackingImageFileInfo struct {
// +optional
VirtualSize int64 `json:"virtualSize"`
// +optional
RealSize int64 `json:"realSize"`
// +optional
State BackingImageState `json:"state"`
// +optional
CurrentChecksum string `json:"currentChecksum"`
Expand Down
3 changes: 3 additions & 0 deletions k8s/pkg/apis/longhorn/v1beta2/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ type DiskStatus struct {
// +nullable
ScheduledReplica map[string]int64 `json:"scheduledReplica"`
// +optional
// +nullable
ScheduledBackingImage map[string]int64 `json:"scheduledBackingImage"`
// +optional
DiskUUID string `json:"diskUUID"`
// +optional
DiskName string `json:"diskName"`
Expand Down
7 changes: 7 additions & 0 deletions k8s/pkg/apis/longhorn/v1beta2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.