github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19263 from hongchaodeng/metrics

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-05 00:40:52 -08:00
commit 823cddf53e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/pkg/scheduler/metrics/metrics.go
View File

@ -28,28 +28,28 @@ const schedulerSubsystem = "scheduler"
var BindingSaturationReportInterval = 1 * time.Second var BindingSaturationReportInterval = 1 * time.Second
var ( var (
E2eSchedulingLatency = prometheus.NewSummary( E2eSchedulingLatency = prometheus.NewHistogram(
prometheus.SummaryOpts{ prometheus.HistogramOpts{
Subsystem: schedulerSubsystem, Subsystem: schedulerSubsystem,
Name: "e2e_scheduling_latency_microseconds", Name: "e2e_scheduling_latency_microseconds",
Help: "E2e scheduling latency (scheduling algorithm + binding)", Help: "E2e scheduling latency (scheduling algorithm + binding)",
MaxAge: time.Hour, Buckets: prometheus.ExponentialBuckets(1000, 2, 15),
}, },
) )
SchedulingAlgorithmLatency = prometheus.NewSummary( SchedulingAlgorithmLatency = prometheus.NewHistogram(
prometheus.SummaryOpts{ prometheus.HistogramOpts{
Subsystem: schedulerSubsystem, Subsystem: schedulerSubsystem,
Name: "scheduling_algorithm_latency_microseconds", Name: "scheduling_algorithm_latency_microseconds",
Help: "Scheduling algorithm latency", Help: "Scheduling algorithm latency",
MaxAge: time.Hour, Buckets: prometheus.ExponentialBuckets(1000, 2, 15),
}, },
) )
BindingLatency = prometheus.NewSummary( BindingLatency = prometheus.NewHistogram(
prometheus.SummaryOpts{ prometheus.HistogramOpts{
Subsystem: schedulerSubsystem, Subsystem: schedulerSubsystem,
Name: "binding_latency_microseconds", Name: "binding_latency_microseconds",
Help: "Binding latency", Help: "Binding latency",
MaxAge: time.Hour, Buckets: prometheus.ExponentialBuckets(1000, 2, 15),
}, },
) )
BindingRateLimiterSaturation = prometheus.NewGauge( BindingRateLimiterSaturation = prometheus.NewGauge(

10
plugin/pkg/scheduler/scheduler.go
View File

@ -125,17 +125,15 @@ func (s *Scheduler) scheduleOne() {
glog.V(3).Infof("Attempting to schedule: %+v", pod) glog.V(3).Infof("Attempting to schedule: %+v", pod)
start := time.Now() start := time.Now()
defer func() {
metrics.E2eSchedulingLatency.Observe(metrics.SinceInMicroseconds(start))
}()
dest, err := s.config.Algorithm.Schedule(pod, s.config.NodeLister) dest, err := s.config.Algorithm.Schedule(pod, s.config.NodeLister)
metrics.SchedulingAlgorithmLatency.Observe(metrics.SinceInMicroseconds(start))
if err != nil { if err != nil {
glog.V(1).Infof("Failed to schedule: %+v", pod) glog.V(1).Infof("Failed to schedule: %+v", pod)
s.config.Recorder.Eventf(pod, api.EventTypeWarning, "FailedScheduling", "%v", err) s.config.Recorder.Eventf(pod, api.EventTypeWarning, "FailedScheduling", "%v", err)
s.config.Error(pod, err) s.config.Error(pod, err)
return return
} }
metrics.SchedulingAlgorithmLatency.Observe(metrics.SinceInMicroseconds(start))
b := &api.Binding{ b := &api.Binding{
ObjectMeta: api.ObjectMeta{Namespace: pod.Namespace, Name: pod.Name}, ObjectMeta: api.ObjectMeta{Namespace: pod.Namespace, Name: pod.Name},
Target: api.ObjectReference{ Target: api.ObjectReference{
@ -149,17 +147,19 @@ func (s *Scheduler) scheduleOne() {
s.config.Modeler.LockedAction(func() { s.config.Modeler.LockedAction(func() {
bindingStart := time.Now() bindingStart := time.Now()
err := s.config.Binder.Bind(b) err := s.config.Binder.Bind(b)
metrics.BindingLatency.Observe(metrics.SinceInMicroseconds(bindingStart))
if err != nil { if err != nil {
glog.V(1).Infof("Failed to bind pod: %+v", err) glog.V(1).Infof("Failed to bind pod: %+v", err)
s.config.Recorder.Eventf(pod, api.EventTypeNormal, "FailedScheduling", "Binding rejected: %v", err) s.config.Recorder.Eventf(pod, api.EventTypeNormal, "FailedScheduling", "Binding rejected: %v", err)
s.config.Error(pod, err) s.config.Error(pod, err)
return return
} }
metrics.BindingLatency.Observe(metrics.SinceInMicroseconds(bindingStart))
s.config.Recorder.Eventf(pod, api.EventTypeNormal, "Scheduled", "Successfully assigned %v to %v", pod.Name, dest) s.config.Recorder.Eventf(pod, api.EventTypeNormal, "Scheduled", "Successfully assigned %v to %v", pod.Name, dest)
// tell the model to assume that this binding took effect. // tell the model to assume that this binding took effect.
assumed := *pod assumed := *pod
assumed.Spec.NodeName = dest assumed.Spec.NodeName = dest
s.config.Modeler.AssumePod(&assumed) s.config.Modeler.AssumePod(&assumed)
}) })
metrics.E2eSchedulingLatency.Observe(metrics.SinceInMicroseconds(start))
} }