Skip to content

refactor: use ResourceList for node resource usage #189

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

Open
cheney-lin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: use ResourceList for node resource usage #189

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
15 changes: 15 additions & 0 deletions config/crd/bases/config.katalyst.kubewharf.io_transparentmemoryoffloadingconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ spec:
identifying memory pages that can be offloaded.
type: number
type: object
reservedInactiveFile:
description: ReservedInactiveFile is the reserved value
of inactive file memory
format: int64
type: integer
type: object
required:
- cgroupPath
Expand Down Expand Up @@ -280,6 +285,11 @@ spec:
identifying memory pages that can be offloaded.
type: number
type: object
reservedInactiveFile:
description: ReservedInactiveFile is the reserved value
of inactive file memory
format: int64
type: integer
type: object
poolName:
description: PoolName is a resource pool name, e.g. system,
Expand Down Expand Up @@ -350,6 +360,11 @@ spec:
identifying memory pages that can be offloaded.
type: number
type: object
reservedInactiveFile:
description: ReservedInactiveFile is the reserved value
of inactive file memory
format: int64
type: integer
type: object
qosLevel:
description: QoSLevel is either of reclaimed_cores, shared_cores,
Expand Down
76 changes: 24 additions & 52 deletions config/crd/bases/node.katalyst.kubewharf.io_customnoderesources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,21 +154,14 @@ spec:
- system_cores
type: string
genericUsage:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: GenericUsage contains the real-time resource
usage
properties:
cpu:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
memory:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
numaUsage:
description: NUMAUsage contains the real-time resource usage
Expand All @@ -178,21 +171,14 @@ spec:
numaId:
type: integer
usage:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Usage contains the real-time resource
usage for this NUMA node
properties:
cpu:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
memory:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
required:
- numaId
Expand All @@ -214,21 +200,14 @@ spec:
description: NodeMetric contains the metrics for this node.
properties:
genericUsage:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: GenericUsage contains the real-time resource
usage
properties:
cpu:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
memory:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
numaUsage:
description: NUMAUsage contains the real-time resource usage
Expand All @@ -238,21 +217,14 @@ spec:
numaId:
type: integer
usage:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Usage contains the real-time resource usage
for this NUMA node
properties:
cpu:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
memory:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
required:
- numaId
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/config/v1alpha1/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.

9 changes: 2 additions & 7 deletions pkg/apis/node/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,17 +338,12 @@ type NodeMetricStatus struct {
GroupMetric []GroupMetricInfo `json:"groupMetric,omitempty"`
}

type ResourceMetric struct {
CPU *resource.Quantity `json:"cpu,omitempty"`
Memory *resource.Quantity `json:"memory,omitempty"`
}

type ResourceUsage struct {
// NUMAUsage contains the real-time resource usage for each NUMA
NUMAUsage []NUMAMetricInfo `json:"numaUsage,omitempty"`

// GenericUsage contains the real-time resource usage
GenericUsage *ResourceMetric `json:"genericUsage,omitempty"`
GenericUsage v1.ResourceList `json:"genericUsage,omitempty"`
}

type GroupMetricInfo struct {
Expand All @@ -367,7 +362,7 @@ type NodeMetricInfo struct {
type NUMAMetricInfo struct {
NUMAId int `json:"numaId"`
// Usage contains the real-time resource usage for this NUMA node
Usage *ResourceMetric `json:"usage"`
Usage v1.ResourceList `json:"usage"`
}

// ResourcePackage represents a single compute package definition.
Expand Down
100 changes: 70 additions & 30 deletions pkg/apis/node/v1alpha1/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.

Loading