scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass all changes of DeletionTimestamp and DeletionGracePeriodSeconds to kubelet

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2015-09-24 23:08:28 +02:00
parent df91307265
commit 74e57e85f1
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
contrib/mesos/pkg/executor/executor.go
View File

@@ -36,6 +36,7 @@ import (
"k8s.io/kubernetes/contrib/mesos/pkg/node" "k8s.io/kubernetes/contrib/mesos/pkg/node"
"k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
unversionedapi "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/framework"
@@ -376,21 +377,25 @@ func (k *KubernetesExecutor) handleChangedApiserverPod(pod *api.Pod) {
oldPod := k.pods[task.podName] oldPod := k.pods[task.podName]
// terminating pod? // terminating pod?
if oldPod != nil && oldPod.DeletionTimestamp == nil && if oldPod != nil && pod.Status.Phase == api.PodRunning {
pod.DeletionTimestamp != nil && pod.Status.Phase == api.PodRunning && timeModified := differentTime(oldPod.DeletionTimestamp, pod.DeletionTimestamp)
pod.DeletionGracePeriodSeconds != nil && *pod.DeletionGracePeriodSeconds > 0 { graceModified := differentPeriod(oldPod.DeletionGracePeriodSeconds, pod.DeletionGracePeriodSeconds)
if timeModified || graceModified {
log.Infof("pod %s/%s is terminating at %v with %vs grace period, telling kubelet", pod.Namespace, pod.Name, *pod.DeletionTimestamp, *pod.DeletionGracePeriodSeconds)
log.Infof("pod %s/%s is terminating at %v with %vs grace period, telling kubelet", pod.Namespace, pod.Name, *pod.DeletionTimestamp, *pod.DeletionGracePeriodSeconds) // modify the pod in our registry instead of sending the new pod. The later
// would allow that other changes bleed into the kubelet. For now we are
// very conservative changing this behaviour.
// TODO(sttts): check whether we can and should send all changes down to the kubelet
oldPod.DeletionTimestamp = pod.DeletionTimestamp
oldPod.DeletionGracePeriodSeconds = pod.DeletionGracePeriodSeconds
// modify pod in our registry to avoid that other changed bleed into the kubelet update := kubelet.PodUpdate{
oldPod.DeletionTimestamp = pod.DeletionTimestamp Op: kubelet.UPDATE,
oldPod.DeletionGracePeriodSeconds = pod.DeletionGracePeriodSeconds Pods: []*api.Pod{oldPod},
}
update := kubelet.PodUpdate{ k.updateChan <- update
Op: kubelet.UPDATE,
Pods: []*api.Pod{oldPod},
} }
k.updateChan <- update
} }
} }
@@ -940,3 +945,11 @@ func (k *KubernetesExecutor) sendLoop() {
} }
} }
} }
func differentTime(a, b *unversionedapi.Time) bool {
return (a == nil) != (b == nil) || (a != nil && b != nil && *a != *b)
}
func differentPeriod(a, b *int64) bool {
return (a == nil) != (b == nil) || (a != nil && b != nil && *a != *b)
}