-
Notifications
You must be signed in to change notification settings - Fork 62
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.
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
Add a metric of AppWrappers counts per state #675
Open
ronensc
wants to merge
4
commits into
project-codeflare:main
Choose a base branch
from
ronensc:add-metrics-queue
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| Copyright 2023 The Multi-Cluster App Dispatcher Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package queuejob | ||
|
|
||
| import ( | ||
| arbv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| "k8s.io/apimachinery/pkg/labels" | ||
| "k8s.io/klog/v2" | ||
| "reflect" | ||
| "runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/metrics" | ||
| "time" | ||
| ) | ||
|
|
||
| var ( | ||
| allocatableCapacityCpu = prometheus.NewGauge(prometheus.GaugeOpts{ | ||
| Subsystem: "mcad", | ||
| Name: "allocatable_capacity_cpu", | ||
| Help: "Allocatable CPU Capacity (in millicores)", | ||
| }) | ||
| allocatableCapacityMemory = prometheus.NewGauge(prometheus.GaugeOpts{ | ||
| Subsystem: "mcad", | ||
| Name: "allocatable_capacity_memory", | ||
| Help: "Allocatable Memory Capacity", | ||
| }) | ||
| allocatableCapacityGpu = prometheus.NewGauge(prometheus.GaugeOpts{ | ||
| Subsystem: "mcad", | ||
| Name: "allocatable_capacity_gpu", | ||
| Help: "Allocatable GPU Capacity", | ||
| }) | ||
| appWrappersCount = prometheus.NewGaugeVec(prometheus.GaugeOpts{ | ||
| Subsystem: "mcad", | ||
| Name: "appwrappers_count", | ||
| Help: "AppWrappers count per state", | ||
| }, []string{"state"}) | ||
| ) | ||
|
|
||
| func init() { | ||
| klog.V(10).Infof("Registering metrics") | ||
| metrics.Registry.MustRegister( | ||
| allocatableCapacityCpu, | ||
| allocatableCapacityMemory, | ||
| allocatableCapacityGpu, | ||
| appWrappersCount, | ||
| ) | ||
| } | ||
|
|
||
| func updateMetricsLoop(controller *XController, stopCh <-chan struct{}) { | ||
| updateMetricsLoopGeneric(controller, stopCh, time.Minute*1, updateAllocatableCapacity) | ||
| updateMetricsLoopGeneric(controller, stopCh, time.Second*5, updateQueue) | ||
| } | ||
|
|
||
| func getFuncName(f interface{}) string { | ||
| return runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name() | ||
| } | ||
|
|
||
| func updateMetricsLoopGeneric(controller *XController, stopCh <-chan struct{}, d time.Duration, updateFunc func(xController *XController)) { | ||
| ticker := time.NewTicker(d) | ||
| go func() { | ||
| updateFunc(controller) | ||
| for { | ||
| select { | ||
| case <-ticker.C: | ||
| if klog.V(10).Enabled() { | ||
| klog.Infof("[updateMetricsLoopGeneric] Update metrics loop tick: %v", getFuncName(updateFunc)) | ||
| } | ||
| updateFunc(controller) | ||
| case <-stopCh: | ||
| if klog.V(10).Enabled() { | ||
| klog.Infof("[updateMetricsLoopGeneric] Exiting update metrics loop: %v", getFuncName(updateFunc)) | ||
| } | ||
| ticker.Stop() | ||
| return | ||
| } | ||
| } | ||
| }() | ||
| } | ||
|
|
||
| func updateAllocatableCapacity(controller *XController) { | ||
| res := controller.GetAllocatableCapacity() | ||
| allocatableCapacityCpu.Set(res.MilliCPU) | ||
| allocatableCapacityMemory.Set(res.Memory) | ||
| allocatableCapacityGpu.Set(float64(res.GPU)) | ||
| } | ||
|
|
||
| func updateQueue(controller *XController) { | ||
| awList, err := controller.appWrapperLister.List(labels.Everything()) | ||
|
|
||
| if err != nil { | ||
| klog.Errorf("[updateQueue] Unable to obtain the list of AppWrappers: %+v", err) | ||
| return | ||
| } | ||
| stateToAppWrapperCount := map[arbv1.AppWrapperState]int{ | ||
| arbv1.AppWrapperStateEnqueued: 0, | ||
| arbv1.AppWrapperStateActive: 0, | ||
| arbv1.AppWrapperStateDeleted: 0, | ||
| arbv1.AppWrapperStateFailed: 0, | ||
| arbv1.AppWrapperStateCompleted: 0, | ||
| arbv1.AppWrapperStateRunningHoldCompletion: 0, | ||
| } | ||
| for _, aw := range awList { | ||
| state := aw.Status.State | ||
| stateToAppWrapperCount[state]++ | ||
| } | ||
| for state, count := range stateToAppWrapperCount { | ||
| appWrappersCount.WithLabelValues(string(state)).Set(float64(count)) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In case of error, should we update the counters to 0 or leave them as is?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should leave them as is and retry to update with new value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This update is done periodically. So instead of retrying, we can simply wait for the next update on the next tick.
I dug deeper into the implementation of
controller.appWrapperLister.List(labels.Everything()), and it seems that sincelabels.Everything().Empty()returns true, there is no way thatcontroller.appWrapperLister.List()will return an error. So the discussion seems to be purely theoretical.