github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug in webserver test container and add extra diagnostics

Browse Source
This commit is contained in:
Satnam Singh 2015-03-18 14:17:41 -07:00
parent 1e5eec62ef
commit 701c0e23dc
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/for-tests/network-tester/Makefile
View File

@ -1,13 +1,15 @@
all: push all: push
TAG = 1.1
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 go build -a -installsuffix cgo -ldflags '-w' ./webserver.go
container: webserver container: webserver
sudo docker build -t kubernetes/nettest . sudo docker build -t kubernetes/nettest:$(TAG) .
push: container push: container
sudo docker push kubernetes/nettest sudo docker push kubernetes/nettest:$(TAG)
clean: clean:
rm -f webserver rm -f webserver

10
contrib/for-tests/network-tester/webserver.go
View File

@ -88,6 +88,7 @@ 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, s.Sent, s.Received, *peerCount)
fmt.Fprintf(w, "fail") fmt.Fprintf(w, "fail")
} }
@ -213,12 +214,13 @@ func contactOthers(state *State) {
for i := 0; i < 15; i++ { for i := 0; i < 15; i++ {
endpoints, err := client.Endpoints(*namespace).Get(*service) endpoints, err := client.Endpoints(*namespace).Get(*service)
if err != nil { 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) time.Sleep(time.Duration(1+rand.Intn(10)) * time.Second)
} }
for _, e := range endpoints.Endpoints { for i, e := range endpoints.Endpoints {
contactSingle("http://"+e.IP+":"+string(e.Port), state) 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) 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)) resp, err := http.Post(e+"/write", "application/json", bytes.NewReader(body))
if err != nil { 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 return
} }
defer resp.Body.Close() defer resp.Body.Close()