-
Notifications
You must be signed in to change notification settings - Fork 40.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1534 from proppy/kubelet-noonce
kubelet: add --runonce flag
- Loading branch information
Showing
4 changed files
with
272 additions
and
5 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
/* | ||
Copyright 2014 Google Inc. 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 kubelet | ||
|
||
import ( | ||
"fmt" | ||
"time" | ||
|
||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" | ||
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" | ||
"github.com/golang/glog" | ||
) | ||
|
||
const ( | ||
RunOnceManifestDelay = 1 * time.Second | ||
RunOnceMaxRetries = 10 | ||
RunOnceRetryDelay = 1 * time.Second | ||
RunOnceRetryDelayBackoff = 2 | ||
) | ||
|
||
type RunPodResult struct { | ||
Pod *Pod | ||
Info api.PodInfo | ||
Err error | ||
} | ||
|
||
// RunOnce polls from one configuration update and run the associated pods. | ||
func (kl *Kubelet) RunOnce(updates <-chan PodUpdate) ([]RunPodResult, error) { | ||
select { | ||
case u := <-updates: | ||
glog.Infof("processing manifest with %d pods", len(u.Pods)) | ||
result, err := kl.runOnce(u.Pods) | ||
glog.Infof("finished processing %d pods", len(u.Pods)) | ||
return result, err | ||
case <-time.After(RunOnceManifestDelay): | ||
return nil, fmt.Errorf("no pod manifest update after %v", RunOnceManifestDelay) | ||
} | ||
} | ||
|
||
// runOnce runs a given set of pods and returns their status. | ||
func (kl *Kubelet) runOnce(pods []Pod) (results []RunPodResult, err error) { | ||
if kl.dockerPuller == nil { | ||
kl.dockerPuller = dockertools.NewDockerPuller(kl.dockerClient, kl.pullQPS, kl.pullBurst) | ||
} | ||
pods = filterHostPortConflicts(pods) | ||
|
||
ch := make(chan RunPodResult) | ||
for _, pod := range pods { | ||
go func() { | ||
info, err := kl.runPod(pod) | ||
ch <- RunPodResult{&pod, info, err} | ||
}() | ||
} | ||
|
||
glog.Infof("waiting for %d pods", len(pods)) | ||
failedPods := []string{} | ||
for i := 0; i < len(pods); i++ { | ||
res := <-ch | ||
results = append(results, res) | ||
if res.Err != nil { | ||
glog.Infof("failed to start pod %q: %v", res.Pod.Name, res.Err) | ||
failedPods = append(failedPods, res.Pod.Name) | ||
} else { | ||
glog.Infof("started pod %q: %#v", res.Pod.Name, res.Info) | ||
} | ||
} | ||
if len(failedPods) > 0 { | ||
return results, fmt.Errorf("error running pods: %v", failedPods) | ||
} | ||
glog.Infof("%d pods started", len(pods)) | ||
return results, err | ||
} | ||
|
||
// Run a single pod and wait until all containers are running. | ||
func (kl *Kubelet) runPod(pod Pod) (api.PodInfo, error) { | ||
dockerContainers, err := dockertools.GetKubeletDockerContainers(kl.dockerClient, false) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to get kubelet docker containers: %v", err) | ||
} | ||
|
||
delay := RunOnceRetryDelay | ||
retry := 0 | ||
for { | ||
glog.Infof("syncing pod") | ||
err := kl.syncPod(&pod, dockerContainers) | ||
if err != nil { | ||
return nil, fmt.Errorf("error syncing pod: %v", err) | ||
} | ||
info, err := kl.GetPodInfo(GetPodFullName(&pod), pod.Manifest.UUID) | ||
if err != nil { | ||
return nil, fmt.Errorf("error getting pod info: %v", err) | ||
} | ||
if podInfo(info).isRunning() { | ||
return info, nil | ||
} | ||
if retry >= RunOnceMaxRetries { | ||
return nil, fmt.Errorf("timeout error: pod %q containers not running after %d retries", pod.Name, RunOnceMaxRetries) | ||
} | ||
glog.Infof("pod %q containers not running, waiting for %v", pod.Name, delay) | ||
<-time.After(delay) | ||
retry++ | ||
delay *= RunOnceRetryDelayBackoff | ||
} | ||
} | ||
|
||
// Alias PodInfo for internal usage. | ||
type podInfo api.PodInfo | ||
|
||
// Check if all containers of a pod are running. | ||
func (info podInfo) isRunning() bool { | ||
for _, container := range info { | ||
if container.State.Running == nil { | ||
return false | ||
} | ||
} | ||
return true | ||
} |
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,115 @@ | ||
/* | ||
Copyright 2014 Google Inc. 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 kubelet | ||
|
||
import ( | ||
"fmt" | ||
"strconv" | ||
"testing" | ||
|
||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" | ||
"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" | ||
docker "github.com/fsouza/go-dockerclient" | ||
) | ||
|
||
type listContainersResult struct { | ||
label string | ||
containers []docker.APIContainers | ||
err error | ||
} | ||
|
||
type inspectContainersResult struct { | ||
label string | ||
container docker.Container | ||
err error | ||
} | ||
|
||
type testDocker struct { | ||
listContainersResults []listContainersResult | ||
inspectContainersResults []inspectContainersResult | ||
dockertools.FakeDockerClient | ||
t *testing.T | ||
} | ||
|
||
func (d *testDocker) ListContainers(options docker.ListContainersOptions) ([]docker.APIContainers, error) { | ||
if len(d.listContainersResults) > 0 { | ||
result := d.listContainersResults[0] | ||
d.listContainersResults = d.listContainersResults[1:] | ||
d.t.Logf("ListContainers: %q, returning: (%v, %v)", result.label, result.containers, result.err) | ||
return result.containers, result.err | ||
} | ||
return nil, fmt.Errorf("ListContainers error: no more test results") | ||
} | ||
|
||
func (d *testDocker) InspectContainer(id string) (*docker.Container, error) { | ||
if len(d.inspectContainersResults) > 0 { | ||
result := d.inspectContainersResults[0] | ||
d.inspectContainersResults = d.inspectContainersResults[1:] | ||
d.t.Logf("InspectContainers: %q, returning: (%v, %v)", result.label, result.container, result.err) | ||
return &result.container, result.err | ||
} | ||
return nil, fmt.Errorf("InspectContainer error: no more test results") | ||
} | ||
|
||
func TestRunOnce(t *testing.T) { | ||
kb := &Kubelet{} | ||
container := api.Container{Name: "bar"} | ||
kb.dockerClient = &testDocker{ | ||
listContainersResults: []listContainersResult{ | ||
{label: "pre syncPod", containers: []docker.APIContainers{}}, | ||
{label: "syncPod #1", containers: []docker.APIContainers{}}, | ||
{label: "syncPod #2", containers: []docker.APIContainers{}}, | ||
{label: "post syncPod", containers: []docker.APIContainers{ | ||
{ | ||
Names: []string{"/k8s_bar." + strconv.FormatUint(dockertools.HashContainer(&container), 16) + "_foo.test"}, | ||
ID: "1234", | ||
}, | ||
{ | ||
Names: []string{"/k8s_net_foo.test_"}, | ||
ID: "9876", | ||
}, | ||
}}, | ||
}, | ||
inspectContainersResults: []inspectContainersResult{ | ||
{label: "syncPod", container: docker.Container{State: docker.State{Running: true}}}, | ||
{label: "syncPod", container: docker.Container{State: docker.State{Running: true}}}, | ||
}, | ||
t: t, | ||
} | ||
kb.dockerPuller = &dockertools.FakeDockerPuller{} | ||
results, err := kb.runOnce([]Pod{ | ||
{ | ||
Name: "foo", | ||
Namespace: "test", | ||
Manifest: api.ContainerManifest{ | ||
ID: "foo", | ||
Containers: []api.Container{ | ||
{Name: "bar"}, | ||
}, | ||
}, | ||
}, | ||
}) | ||
if err != nil { | ||
t.Errorf("unexpected error: %v", err) | ||
} | ||
if results[0].Err != nil { | ||
t.Errorf("unexpected run pod error: %v", results[0].Err) | ||
} | ||
if results[0].Pod.Name != "foo" { | ||
t.Errorf("unexpected pod: %q", results[0].Pod.Name) | ||
} | ||
} |