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

fix(metrics): don't parse backup.status.size with an empty string (backport #3554) #3556

Merged
merged 2 commits into from
Feb 11, 2025
Merged

fix(metrics): don't parse backup.status.size with an empty string (backport #3554) #3556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86ad987
fix(revert): revert "fix: empty string of backup.status.size"
derekbit Feb 11, 2025
f742d17
fix(metrics): don't parse backup.status.size with an empty string
derekbit Feb 11, 2025
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
47 changes: 22 additions & 25 deletions k8s/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backingimagedatasources.longhorn.io
Expand Down Expand Up @@ -189,7 +189,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backingimagemanagers.longhorn.io
Expand Down Expand Up @@ -379,7 +379,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backingimages.longhorn.io
Expand Down Expand Up @@ -581,7 +581,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backupbackingimages.longhorn.io
Expand Down Expand Up @@ -735,7 +735,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backups.longhorn.io
Expand Down Expand Up @@ -919,7 +919,6 @@ spec:
description: The address of the replica that runs snapshot backup.
type: string
size:
default: "0"
description: The snapshot size.
type: string
snapshotCreatedAt:
Expand Down Expand Up @@ -948,8 +947,6 @@ spec:
volumeSize:
description: The volume size.
type: string
required:
- size
type: object
type: object
served: true
Expand All @@ -961,7 +958,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backuptargets.longhorn.io
Expand Down Expand Up @@ -1162,7 +1159,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: backupvolumes.longhorn.io
Expand Down Expand Up @@ -1341,7 +1338,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: engineimages.longhorn.io
Expand Down Expand Up @@ -1553,7 +1550,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: engines.longhorn.io
Expand Down Expand Up @@ -1949,7 +1946,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: instancemanagers.longhorn.io
Expand Down Expand Up @@ -2248,7 +2245,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: nodes.longhorn.io
Expand Down Expand Up @@ -2527,7 +2524,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: orphans.longhorn.io
Expand Down Expand Up @@ -2638,7 +2635,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: recurringjobs.longhorn.io
Expand Down Expand Up @@ -2834,7 +2831,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: replicas.longhorn.io
Expand Down Expand Up @@ -3114,7 +3111,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: settings.longhorn.io
Expand Down Expand Up @@ -3227,7 +3224,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: sharemanagers.longhorn.io
Expand Down Expand Up @@ -3354,7 +3351,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: snapshots.longhorn.io
Expand Down Expand Up @@ -3484,7 +3481,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: supportbundles.longhorn.io
Expand Down Expand Up @@ -3615,7 +3612,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: systembackups.longhorn.io
Expand Down Expand Up @@ -3752,7 +3749,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: systemrestores.longhorn.io
Expand Down Expand Up @@ -3861,7 +3858,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: volumeattachments.longhorn.io
Expand Down Expand Up @@ -4005,7 +4002,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.1
controller-gen.kubebuilder.io/version: v0.15.0
labels:
longhorn-manager: ""
name: volumes.longhorn.io
Expand Down
2 changes: 1 addition & 1 deletion k8s/pkg/apis/longhorn/v1beta2/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type BackupStatus struct {
// +optional
BackupCreatedAt string `json:"backupCreatedAt"`
// The snapshot size.
// +kubebuilder:default="0"
// +optional
Size string `json:"size"`
// The labels of snapshot backup.
// +optional
Expand Down
6 changes: 4 additions & 2 deletions metrics_collector/backup_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ func (bc *BackupCollector) Collect(ch chan<- prometheus.Metric) {
for _, backup := range backupLists {
if backup.Status.OwnerID == bc.currentNodeID {
var size float64
if size, err = strconv.ParseFloat(backup.Status.Size, 64); err != nil {
bc.logger.WithError(err).Warn("Error get size")
if backup.Status.Size != "" {
if size, err = strconv.ParseFloat(backup.Status.Size, 64); err != nil {
bc.logger.WithError(err).Warn("Error get size")
}
}
backupVolumeName, ok := backup.Labels[types.LonghornLabelBackupVolume]
if !ok {
Expand Down
15 changes: 0 additions & 15 deletions upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"github.com/longhorn/longhorn-manager/upgrade/v15xto160"
"github.com/longhorn/longhorn-manager/upgrade/v16xto170"
"github.com/longhorn/longhorn-manager/upgrade/v170to171"
"github.com/longhorn/longhorn-manager/upgrade/v172to173"
"github.com/longhorn/longhorn-manager/upgrade/v1beta1"

longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2"
Expand Down Expand Up @@ -276,13 +275,6 @@ func doResourceUpgrade(namespace string, lhClient *lhclientset.Clientset, kubeCl
return err
}
}
if semver.Compare(lhVersionBeforeUpgrade, "v1.7.3") < 0 {
logrus.Info("Walking through the resource upgrade path v1.7.2 to v1.7.3")
if err := v172to173.UpgradeResources(namespace, lhClient, kubeClient, resourceMaps); err != nil {
return err
}
}

if err := upgradeutil.UpdateResources(namespace, lhClient, resourceMaps); err != nil {
return err
}
Expand All @@ -309,13 +301,6 @@ func doResourceUpgrade(namespace string, lhClient *lhclientset.Clientset, kubeCl
return err
}
}
if semver.Compare(lhVersionBeforeUpgrade, "v1.7.3") < 0 {
logrus.Info("Walking through the resource status upgrade path v1.7.2 to v1.7.3")
if err := v172to173.UpgradeResourcesStatus(namespace, lhClient, kubeClient, resourceMaps); err != nil {
return err
}
}

if err := upgradeutil.UpdateResourcesStatus(namespace, lhClient, resourceMaps); err != nil {
return err
}
Expand Down
51 changes: 0 additions & 51 deletions upgrade/v172to173/upgrade.go
View file
Open in desktop

This file was deleted.