-
Notifications
You must be signed in to change notification settings - Fork 38.7k
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
MESOS: add node/slave-update controller to controller-manager #16034
Merged
k8s-github-robot
merged 4 commits into
kubernetes:master
from
mesosphere-backup:sttts-node-lifecycle
Nov 16, 2015
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
6a2602a
Make cloud provider return disappearence of slave to the node controller
sttts bc7523a
Make controller manager node monitor constant public
sttts 0c1d90b
Add ListWithoutKubelet to mesos cloud provider
sttts 2f45d57
Add node status update controller
sttts File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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,195 @@ | ||
/* | ||
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 node | ||
|
||
import ( | ||
"fmt" | ||
"time" | ||
|
||
log "github.com/golang/glog" | ||
kubelet "k8s.io/kubernetes/cmd/kubelet/app" | ||
"k8s.io/kubernetes/contrib/mesos/pkg/runtime" | ||
"k8s.io/kubernetes/pkg/api" | ||
"k8s.io/kubernetes/pkg/api/errors" | ||
"k8s.io/kubernetes/pkg/api/unversioned" | ||
"k8s.io/kubernetes/pkg/client/cache" | ||
client "k8s.io/kubernetes/pkg/client/unversioned" | ||
"k8s.io/kubernetes/pkg/cloudprovider/providers/mesos" | ||
"k8s.io/kubernetes/pkg/fields" | ||
) | ||
|
||
const ( | ||
nodeStatusUpdateRetry = 5 | ||
slaveReadyReason = "SlaveReady" | ||
slaveReadyMessage = "mesos reports ready status" | ||
) | ||
|
||
type StatusUpdater struct { | ||
client *client.Client | ||
relistPeriod time.Duration | ||
heartBeatPeriod time.Duration | ||
nowFunc func() time.Time | ||
} | ||
|
||
func NewStatusUpdater(client *client.Client, relistPeriod time.Duration, nowFunc func() time.Time) *StatusUpdater { | ||
kubecfg := kubelet.NewKubeletServer() // only create to get the config, this is without side-effects | ||
return &StatusUpdater{ | ||
client: client, | ||
relistPeriod: relistPeriod, | ||
heartBeatPeriod: kubecfg.NodeStatusUpdateFrequency, | ||
nowFunc: nowFunc, | ||
} | ||
} | ||
|
||
func (u *StatusUpdater) Run(terminate <-chan struct{}) error { | ||
nodeStore := cache.NewStore(cache.MetaNamespaceKeyFunc) | ||
nodeLW := cache.NewListWatchFromClient(u.client, "nodes", api.NamespaceAll, fields.Everything()) | ||
cache.NewReflector(nodeLW, &api.Node{}, nodeStore, u.relistPeriod).Run() | ||
|
||
monitor := func() { | ||
// build up a slave set of nodes without kubelet | ||
slavesWithoutKubeletList, err := mesos.CloudProvider.ListWithoutKubelet() | ||
if err != nil { | ||
log.Errorf("Error while updating slave nodes: %v", err) | ||
return | ||
} | ||
slavesWithoutKubelet := make(map[string]struct{}, len(slavesWithoutKubeletList)) | ||
for _, s := range slavesWithoutKubeletList { | ||
slavesWithoutKubelet[s] = struct{}{} | ||
} | ||
|
||
// update status for nodes which do not have a kubelet running and | ||
// which are still existing as slave. This status update must be done | ||
// before the node controller counts down the NodeMonitorGracePeriod | ||
obj, err := nodeLW.List() | ||
if err != nil { | ||
log.Errorf("Error listing the nodes for status updates: %v", err) | ||
} | ||
nl, _ := obj.(*api.NodeList) | ||
nodes := nl.Items | ||
|
||
for i := range nodes { | ||
if _, ok := slavesWithoutKubelet[nodes[i].Spec.ExternalID]; !ok { | ||
// let the kubelet do its job updating the status, or the | ||
// node controller will remove this node if the node does not even | ||
// exist anymore | ||
continue | ||
} | ||
|
||
err := u.updateStatus(&nodes[i]) | ||
if err != nil { | ||
log.Errorf("Error updating node status: %v", err) | ||
} | ||
} | ||
} | ||
go runtime.Until(monitor, u.heartBeatPeriod, terminate) | ||
|
||
return nil | ||
} | ||
|
||
func (u *StatusUpdater) updateStatus(n *api.Node) error { | ||
for i := 0; i < nodeStatusUpdateRetry; i++ { | ||
if err := u.tryUpdateStatus(n); err != nil && !errors.IsConflict(err) { | ||
log.Errorf("Error updating node status, will retry: %v", err) | ||
} else { | ||
return nil | ||
} | ||
} | ||
return fmt.Errorf("Update node status exceeds retry count") | ||
} | ||
|
||
// nodeWithUpdatedStatus clones the given node and updates the NodeReady condition. | ||
// The updated node is return and a boolean indicating whether the node was changed | ||
// at all. | ||
func (u *StatusUpdater) nodeWithUpdatedStatus(n *api.Node) (*api.Node, bool, error) { | ||
readyCondition := getCondition(&n.Status, api.NodeReady) | ||
currentTime := unversioned.NewTime(u.nowFunc()) | ||
|
||
// avoid flapping by waiting at least twice the kubetlet update frequency, i.e. | ||
// give the kubelet the chance twice to update the heartbeat. This is necessary | ||
// because we only poll the Mesos master state.json once in a while and we | ||
// know that that the information from there can easily be outdated. | ||
gracePeriod := u.heartBeatPeriod * 2 | ||
if readyCondition != nil && !currentTime.After(readyCondition.LastHeartbeatTime.Add(gracePeriod)) { | ||
return n, false, nil | ||
} | ||
|
||
clone, err := api.Scheme.DeepCopy(n) | ||
if err != nil { | ||
return nil, false, err | ||
} | ||
n = clone.(*api.Node) | ||
|
||
newNodeReadyCondition := api.NodeCondition{ | ||
Type: api.NodeReady, | ||
Status: api.ConditionTrue, | ||
Reason: slaveReadyReason, | ||
Message: slaveReadyMessage, | ||
LastHeartbeatTime: currentTime, | ||
} | ||
|
||
found := false | ||
for i := range n.Status.Conditions { | ||
c := &n.Status.Conditions[i] | ||
if c.Type == api.NodeReady { | ||
if c.Status == newNodeReadyCondition.Status { | ||
newNodeReadyCondition.LastTransitionTime = c.LastTransitionTime | ||
} else { | ||
newNodeReadyCondition.LastTransitionTime = currentTime | ||
} | ||
n.Status.Conditions[i] = newNodeReadyCondition | ||
found = true | ||
break | ||
} | ||
} | ||
|
||
if !found { | ||
newNodeReadyCondition.LastTransitionTime = currentTime | ||
n.Status.Conditions = append(n.Status.Conditions, newNodeReadyCondition) | ||
} | ||
|
||
return n, true, nil | ||
} | ||
|
||
// tryUpdateStatus updates the status of the given node and tries to persist that | ||
// on the apiserver | ||
func (u *StatusUpdater) tryUpdateStatus(n *api.Node) error { | ||
n, updated, err := u.nodeWithUpdatedStatus(n) | ||
if err != nil { | ||
return err | ||
} | ||
if !updated { | ||
return nil | ||
} | ||
|
||
_, err = u.client.Nodes().UpdateStatus(n) | ||
return err | ||
} | ||
|
||
// getCondition returns a condition object for the specific condition | ||
// type, nil if the condition is not set. | ||
func getCondition(status *api.NodeStatus, conditionType api.NodeConditionType) *api.NodeCondition { | ||
if status == nil { | ||
return nil | ||
} | ||
for i := range status.Conditions { | ||
if status.Conditions[i].Type == conditionType { | ||
return &status.Conditions[i] | ||
} | ||
} | ||
return nil | ||
} |
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,77 @@ | ||
/* | ||
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 node | ||
|
||
import ( | ||
"testing" | ||
"time" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"k8s.io/kubernetes/cmd/kube-controller-manager/app" | ||
kubelet "k8s.io/kubernetes/cmd/kubelet/app" | ||
"k8s.io/kubernetes/pkg/api" | ||
"k8s.io/kubernetes/pkg/api/unversioned" | ||
) | ||
|
||
func Test_nodeWithUpdatedStatus(t *testing.T) { | ||
now := time.Now() | ||
testNode := func(d time.Duration, s api.ConditionStatus, r string) *api.Node { | ||
return &api.Node{ | ||
Status: api.NodeStatus{ | ||
Conditions: []api.NodeCondition{{ | ||
Type: api.NodeOutOfDisk, | ||
}, { | ||
Type: api.NodeReady, | ||
Status: s, | ||
Reason: r, | ||
Message: "some message we don't care about here", | ||
LastTransitionTime: unversioned.Time{now.Add(-time.Minute)}, | ||
LastHeartbeatTime: unversioned.Time{now.Add(d)}, | ||
}}, | ||
}, | ||
} | ||
} | ||
|
||
cm := app.NewCMServer() | ||
kubecfg := kubelet.NewKubeletServer() | ||
assert.True(t, kubecfg.NodeStatusUpdateFrequency*3 < cm.NodeMonitorGracePeriod) // sanity check for defaults | ||
|
||
n := testNode(0, api.ConditionTrue, "KubeletReady") | ||
su := NewStatusUpdater(nil, cm.NodeMonitorPeriod, func() time.Time { return now }) | ||
_, updated, err := su.nodeWithUpdatedStatus(n) | ||
assert.NoError(t, err) | ||
assert.False(t, updated, "no update expected b/c kubelet updated heartbeat just now") | ||
|
||
n = testNode(-cm.NodeMonitorGracePeriod, api.ConditionTrue, "KubeletReady") | ||
n2, updated, err := su.nodeWithUpdatedStatus(n) | ||
assert.NoError(t, err) | ||
assert.True(t, updated, "update expected b/c kubelet's update is older than DefaultNodeMonitorGracePeriod") | ||
assert.Equal(t, getCondition(&n2.Status, api.NodeReady).Reason, slaveReadyReason) | ||
assert.Equal(t, getCondition(&n2.Status, api.NodeReady).Message, slaveReadyMessage) | ||
|
||
n = testNode(-kubecfg.NodeStatusUpdateFrequency, api.ConditionTrue, "KubeletReady") | ||
n2, updated, err = su.nodeWithUpdatedStatus(n) | ||
assert.NoError(t, err) | ||
assert.False(t, updated, "no update expected b/c kubelet's update was missed only once") | ||
|
||
n = testNode(-kubecfg.NodeStatusUpdateFrequency*3, api.ConditionTrue, "KubeletReady") | ||
n2, updated, err = su.nodeWithUpdatedStatus(n) | ||
assert.NoError(t, err) | ||
assert.True(t, updated, "update expected b/c kubelet's update is older than 3*DefaultNodeStatusUpdateFrequency") | ||
assert.Equal(t, getCondition(&n2.Status, api.NodeReady).Reason, slaveReadyReason) | ||
assert.Equal(t, getCondition(&n2.Status, api.NodeReady).Message, slaveReadyMessage) | ||
} |
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.
should this
break
oncefound
is set totrue
?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.
Break would make sense. I loosely follow
Kubelet.setNodeStatus
here.