From 214d0189113347a5475c227feff23330196613f5 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 11 Feb 2016 15:32:46 -0800
Subject: [PATCH 1/2] Fix deadlock in nettest webserver

---
 test/images/network-tester/Makefile     | 4 ++--
 test/images/network-tester/webserver.go | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/images/network-tester/Makefile b/test/images/network-tester/Makefile
index 6392da48f67..f1de44bc9d6 100644
--- a/test/images/network-tester/Makefile
+++ b/test/images/network-tester/Makefile
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 1.6
+TAG = 1.7
 PREFIX = gcr.io/google_containers
 
 all: push
 
 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
 
diff --git a/test/images/network-tester/webserver.go b/test/images/network-tester/webserver.go
index 67482a7ad0b..bc00b5cdeea 100644
--- a/test/images/network-tester/webserver.go
+++ b/test/images/network-tester/webserver.go
@@ -90,7 +90,8 @@ func (s *State) serveStatus(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "running")
 		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")
 }
 

From 87b0783808bde7513847d812d3d2c194f80afe26 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 11 Feb 2016 15:37:32 -0800
Subject: [PATCH 2/2] Update tests to use nettest:1.7

---
 test/e2e/networking.go                   | 2 +-
 test/e2e/pods.go                         | 2 +-
 test/e2e/pre_stop.go                     | 2 +-
 test/images/network-tester/rc.json       | 2 +-
 test/images/network-tester/slow-pod.json | 2 +-
 test/images/network-tester/slow-rc.json  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/e2e/networking.go b/test/e2e/networking.go
index 1c8d174ff18..77460030de7 100644
--- a/test/e2e/networking.go
+++ b/test/e2e/networking.go
@@ -157,7 +157,7 @@ var _ = Describe("Networking", func() {
 				"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
 		defer func() {
diff --git a/test/e2e/pods.go b/test/e2e/pods.go
index 4f4b86f9245..352fca35380 100644
--- a/test/e2e/pods.go
+++ b/test/e2e/pods.go
@@ -758,7 +758,7 @@ var _ = Describe("Pods", func() {
 				Containers: []api.Container{
 					{
 						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
 						// we just care about /read serving a 200, which it always does.
 						Args: []string{
diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go
index 1c76c39d0bf..b56a88baa8b 100644
--- a/test/e2e/pre_stop.go
+++ b/test/e2e/pre_stop.go
@@ -43,7 +43,7 @@ func testPreStop(c *client.Client, ns string) {
 			Containers: []api.Container{
 				{
 					Name:  "server",
-					Image: "gcr.io/google_containers/nettest:1.6",
+					Image: "gcr.io/google_containers/nettest:1.7",
 					Ports: []api.ContainerPort{{ContainerPort: 8080}},
 				},
 			},
diff --git a/test/images/network-tester/rc.json b/test/images/network-tester/rc.json
index 0e7375a5262..3d5f2fd2244 100644
--- a/test/images/network-tester/rc.json
+++ b/test/images/network-tester/rc.json
@@ -22,7 +22,7 @@
         "containers": [
           {
             "name": "webserver",
-            "image": "gcr.io/google_containers/nettest:1.6",
+            "image": "gcr.io/google_containers/nettest:1.7",
             "imagePullPolicy": "Always",
             "args": [
               "-service=nettest",
diff --git a/test/images/network-tester/slow-pod.json b/test/images/network-tester/slow-pod.json
index 8fce984aed0..d1745df6b85 100644
--- a/test/images/network-tester/slow-pod.json
+++ b/test/images/network-tester/slow-pod.json
@@ -11,7 +11,7 @@
     "containers": [
       {
         "name": "webserver",
-        "image": "gcr.io/google_containers/nettest:1.5",
+        "image": "gcr.io/google_containers/nettest:1.7",
         "args": [
           "-service=nettest",
           "-delay-shutdown=10"
diff --git a/test/images/network-tester/slow-rc.json b/test/images/network-tester/slow-rc.json
index d70a145555c..4a4e42f9760 100644
--- a/test/images/network-tester/slow-rc.json
+++ b/test/images/network-tester/slow-rc.json
@@ -23,7 +23,7 @@
         "containers": [
           {
             "name": "webserver",
-            "image": "gcr.io/google_containers/nettest:1.5",
+            "image": "gcr.io/google_containers/nettest:1.7",
             "args": [
               "-service=nettest",
               "-delay-shutdown=10"