github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21112 from ixdy/nettest-deadlock-fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-12 22:18:26 -08:00
commit 1bc3a00adc
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/networking.go
View File

@ -157,7 +157,7 @@ var _ = Describe("Networking", func() {
"Rerun it with at least two nodes to get complete coverage.") "Rerun it with at least two nodes to get complete coverage.")
} }
podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.6") podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.7")
// Clean up the pods // Clean up the pods
defer func() { defer func() {

2
test/e2e/pods.go
View File

@ -758,7 +758,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "liveness", Name: "liveness",
Image: "gcr.io/google_containers/nettest:1.6", Image: "gcr.io/google_containers/nettest:1.7",
// These args are garbage but the image will exit if they're not there // These args are garbage but the image will exit if they're not there
// we just care about /read serving a 200, which it always does. // we just care about /read serving a 200, which it always does.
Args: []string{ Args: []string{

2
test/e2e/pre_stop.go
View File

@ -43,7 +43,7 @@ func testPreStop(c *client.Client, ns string) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "server", Name: "server",
Image: "gcr.io/google_containers/nettest:1.6", Image: "gcr.io/google_containers/nettest:1.7",
Ports: []api.ContainerPort{{ContainerPort: 8080}}, Ports: []api.ContainerPort{{ContainerPort: 8080}},
}, },
}, },

4
test/images/network-tester/Makefile
View File

@ -12,13 +12,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = 1.6 TAG = 1.7
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push
webserver: webserver.go webserver: webserver.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' ./webserver.go
container: image container: image

2
test/images/network-tester/rc.json
View File

@ -22,7 +22,7 @@
"containers": [ "containers": [
{ {
"name": "webserver", "name": "webserver",
"image": "gcr.io/google_containers/nettest:1.6", "image": "gcr.io/google_containers/nettest:1.7",
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"args": [ "args": [
"-service=nettest", "-service=nettest",

2
test/images/network-tester/slow-pod.json
View File

@ -11,7 +11,7 @@
"containers": [ "containers": [
{ {
"name": "webserver", "name": "webserver",
"image": "gcr.io/google_containers/nettest:1.5", "image": "gcr.io/google_containers/nettest:1.7",
"args": [ "args": [
"-service=nettest", "-service=nettest",
"-delay-shutdown=10" "-delay-shutdown=10"

2
test/images/network-tester/slow-rc.json
View File

@ -23,7 +23,7 @@
"containers": [ "containers": [
{ {
"name": "webserver", "name": "webserver",
"image": "gcr.io/google_containers/nettest:1.5", "image": "gcr.io/google_containers/nettest:1.7",
"args": [ "args": [
"-service=nettest", "-service=nettest",
"-delay-shutdown=10" "-delay-shutdown=10"

3
test/images/network-tester/webserver.go
View File

@ -90,7 +90,8 @@ func (s *State) serveStatus(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, "running") fmt.Fprintf(w, "running")
return return
} }
s.Logf("Declaring failure for %s/%s with %d sent and %d received and %d peers", *namespace, *service, len(s.Sent), len(s.Received), *peerCount) // Logf can't be called while holding the lock, so defer using a goroutine
go s.Logf("Declaring failure for %s/%s with %d sent and %d received and %d peers", *namespace, *service, len(s.Sent), len(s.Received), *peerCount)
fmt.Fprintf(w, "fail") fmt.Fprintf(w, "fail")
} }