-
Notifications
You must be signed in to change notification settings - Fork 40k
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 volume operation metrics to operation executor and PV controller #50036
Merged
Merged
Changes from all commits
Commits
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
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,63 @@ | ||
| /* | ||
| Copyright 2017 The Kubernetes 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 util | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus" | ||
| ) | ||
|
|
||
| var storageOperationMetric = prometheus.NewHistogramVec( | ||
| prometheus.HistogramOpts{ | ||
| Name: "storage_operation_duration_seconds", | ||
| Help: "Storage operation duration", | ||
| }, | ||
| []string{"volume_plugin", "operation_name"}, | ||
| ) | ||
|
|
||
| var storageOperationErrorMetric = prometheus.NewCounterVec( | ||
| prometheus.CounterOpts{ | ||
| Name: "storage_operation_errors_total", | ||
| Help: "Storage operation errors", | ||
| }, | ||
| []string{"volume_plugin", "operation_name"}, | ||
| ) | ||
|
|
||
| func init() { | ||
| registerMetrics() | ||
| } | ||
|
|
||
| func registerMetrics() { | ||
| prometheus.MustRegister(storageOperationMetric) | ||
| prometheus.MustRegister(storageOperationErrorMetric) | ||
| } | ||
|
|
||
| // OperationCompleteHook returns a hook to call when an operation is completed | ||
| func OperationCompleteHook(plugin, operationName string) func(error) { | ||
| requestTime := time.Now() | ||
| opComplete := func(err error) { | ||
| timeTaken := time.Since(requestTime).Seconds() | ||
| // Create metric with operation name and plugin name | ||
| if err != nil { | ||
| storageOperationErrorMetric.WithLabelValues(plugin, operationName).Inc() | ||
| } else { | ||
| storageOperationMetric.WithLabelValues(plugin, operationName).Observe(timeTaken) | ||
| } | ||
| } | ||
| return opComplete | ||
| } |
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
Oops, something went wrong.
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.
@jsafrane was that an oversight that
provisionClaimOperationfunction does not return error, even if provisioning fails for some reason?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.
curious too, but regardless of answer we decided to wrap Provision since wrapping provisionClaimOperation would include irrelevant API server delays
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.
Yeah I think - we can revisit this later, but I do not think it is a problem if API server delays are included in the metric. Similar metrics too include some API server delays as well. My thinking is - it would have been cleaner to do this in
scheduleOperationbecause then we don't need to modify each operation individually.