diff --git a/contrib/for-tests/network-tester/Makefile b/contrib/for-tests/network-tester/Makefile index 8c69bf0e6df..d108dea6dbd 100644 --- a/contrib/for-tests/network-tester/Makefile +++ b/contrib/for-tests/network-tester/Makefile @@ -1,13 +1,15 @@ all: push +TAG = 1.1 + webserver: webserver.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go container: webserver - sudo docker build -t kubernetes/nettest . + sudo docker build -t kubernetes/nettest:$(TAG) . push: container - sudo docker push kubernetes/nettest + sudo docker push kubernetes/nettest:$(TAG) clean: rm -f webserver diff --git a/contrib/for-tests/network-tester/webserver.go b/contrib/for-tests/network-tester/webserver.go index 3c1e411954a..a2f8d437614 100644 --- a/contrib/for-tests/network-tester/webserver.go +++ b/contrib/for-tests/network-tester/webserver.go @@ -88,6 +88,7 @@ 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, s.Sent, s.Received, *peerCount) fmt.Fprintf(w, "fail") } @@ -213,12 +214,13 @@ func contactOthers(state *State) { for i := 0; i < 15; i++ { endpoints, err := client.Endpoints(*namespace).Get(*service) if err != nil { - state.Logf("Unable to read endpoints for %v/%v: %v; will try again.", *namespace, *service, err) + state.Logf("Unable to read the endpoints for %v/%v: %v; will try again.", *namespace, *service, err) time.Sleep(time.Duration(1+rand.Intn(10)) * time.Second) } - for _, e := range endpoints.Endpoints { - contactSingle("http://"+e.IP+":"+string(e.Port), state) + for i, e := range endpoints.Endpoints { + state.Logf("Attempting to contact IP %s at endpoint number %d port %v", e.IP, i, e.Port) + contactSingle(fmt.Sprintf("http://%s:%d", e.IP, e.Port), state) } time.Sleep(5 * time.Second) @@ -236,7 +238,7 @@ func contactSingle(e string, state *State) { } resp, err := http.Post(e+"/write", "application/json", bytes.NewReader(body)) if err != nil { - state.Logf("Warning: unable to contact '%v': '%v'", e, err) + state.Logf("Warning: unable to contact the endpoint %q: %v", e, err) return } defer resp.Body.Close()