67746908e5
In upstream the kubelet is responsible for all pods which have the spec.NodeName set. In Mesos we have a two-stage scheduling process: 1. pods with a pre-set spec.NodeName are still scheduled by the scheduler. 2. The kubelet will only see them when a Mesos task was started and the executor passes the pod to the kubelet. With this PR a pod with spec.NodeName which is gracefully terminated, but not yet scheduled, e.g. - because the termination happened just after creation and the scheduler was not fast enough - because the NodeSelector does not match is deleted by the Mesos scheduler.
81 lines
1.9 KiB
Go
81 lines
1.9 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors All rights reserved.
|
|
|
|
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 scheduler
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"k8s.io/kubernetes/contrib/mesos/pkg/queue"
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/client/cache"
|
|
)
|
|
|
|
// wrapper for the k8s pod type so that we can define additional methods on a "pod"
|
|
type Pod struct {
|
|
*api.Pod
|
|
deadline *time.Time
|
|
delay *time.Duration
|
|
notify queue.BreakChan
|
|
}
|
|
|
|
// implements Copyable
|
|
func (p *Pod) Copy() queue.Copyable {
|
|
if p == nil {
|
|
return nil
|
|
}
|
|
//TODO(jdef) we may need a better "deep-copy" implementation
|
|
pod := *(p.Pod)
|
|
return &Pod{Pod: &pod}
|
|
}
|
|
|
|
// implements Unique
|
|
func (p *Pod) GetUID() string {
|
|
if id, err := cache.MetaNamespaceKeyFunc(p.Pod); err != nil {
|
|
panic(fmt.Sprintf("failed to determine pod id for '%+v'", p.Pod))
|
|
} else {
|
|
return id
|
|
}
|
|
}
|
|
|
|
// implements Deadlined
|
|
func (dp *Pod) Deadline() (time.Time, bool) {
|
|
if dp.deadline != nil {
|
|
return *(dp.deadline), true
|
|
}
|
|
return time.Time{}, false
|
|
}
|
|
|
|
func (dp *Pod) GetDelay() time.Duration {
|
|
if dp.delay != nil {
|
|
return *(dp.delay)
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func (p *Pod) Breaker() queue.BreakChan {
|
|
return p.notify
|
|
}
|
|
|
|
func (p *Pod) String() string {
|
|
displayDeadline := "<none>"
|
|
if deadline, ok := p.Deadline(); ok {
|
|
displayDeadline = deadline.String()
|
|
}
|
|
return fmt.Sprintf("{pod:%v, deadline:%v, delay:%v}", p.Pod.Name, displayDeadline, p.GetDelay())
|
|
}
|