X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/607fe087f6167061714a524dd53cbbc21b974973..b8f92203bfa5766f9aa8bfb728bb4a1580e7d6d1:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 4e856262dd..a7b608b69c 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -6,11 +10,12 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"log"
+	"math/rand"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
@@ -51,7 +56,7 @@ func waitForListener() {
 		time.Sleep(ms * time.Millisecond)
 	}
 	if listener == nil {
-		log.Fatalf("Timed out waiting for listener to start")
+		panic("Timed out waiting for listener to start")
 	}
 }
 
@@ -185,7 +190,7 @@ func (s *ServerRequiredSuite) TestPutWrongContentLength(c *C) {
 	// fixes the invalid Content-Length header. In order to test
 	// our server behavior, we have to call the handler directly
 	// using an httptest.ResponseRecorder.
-	rtr := MakeRESTRouter(true, true, kc)
+	rtr := MakeRESTRouter(true, true, kc, 10*time.Second, "")
 
 	type testcase struct {
 		sendLength   string
@@ -212,6 +217,33 @@ func (s *ServerRequiredSuite) TestPutWrongContentLength(c *C) {
 	}
 }
 
+func (s *ServerRequiredSuite) TestManyFailedPuts(c *C) {
+	kc := runProxy(c, nil, false)
+	defer closeListener()
+	router.(*proxyHandler).timeout = time.Nanosecond
+
+	buf := make([]byte, 1<<20)
+	rand.Read(buf)
+	var wg sync.WaitGroup
+	for i := 0; i < 128; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			kc.PutB(buf)
+		}()
+	}
+	done := make(chan bool)
+	go func() {
+		wg.Wait()
+		close(done)
+	}()
+	select {
+	case <-done:
+	case <-time.After(10 * time.Second):
+		c.Error("timeout")
+	}
+}
+
 func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 	kc := runProxy(c, nil, false)
 	defer closeListener()
@@ -222,14 +254,14 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 	{
 		_, _, err := kc.Ask(hash)
 		c.Check(err, Equals, keepclient.BlockNotFound)
-		log.Print("Finished Ask (expected BlockNotFound)")
+		c.Log("Finished Ask (expected BlockNotFound)")
 	}
 
 	{
 		reader, _, _, err := kc.Get(hash)
 		c.Check(reader, Equals, nil)
 		c.Check(err, Equals, keepclient.BlockNotFound)
-		log.Print("Finished Get (expected BlockNotFound)")
+		c.Log("Finished Get (expected BlockNotFound)")
 	}
 
 	// Note in bug #5309 among other errors keepproxy would set
@@ -248,14 +280,14 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		c.Check(hash2, Matches, fmt.Sprintf(`^%s\+3(\+.+)?$`, hash))
 		c.Check(rep, Equals, 2)
 		c.Check(err, Equals, nil)
-		log.Print("Finished PutB (expected success)")
+		c.Log("Finished PutB (expected success)")
 	}
 
 	{
 		blocklen, _, err := kc.Ask(hash2)
 		c.Assert(err, Equals, nil)
 		c.Check(blocklen, Equals, int64(3))
-		log.Print("Finished Ask (expected success)")
+		c.Log("Finished Ask (expected success)")
 	}
 
 	{
@@ -264,7 +296,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		all, err := ioutil.ReadAll(reader)
 		c.Check(all, DeepEquals, []byte("foo"))
 		c.Check(blocklen, Equals, int64(3))
-		log.Print("Finished Get (expected success)")
+		c.Log("Finished Get (expected success)")
 	}
 
 	{
@@ -274,7 +306,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		c.Check(hash2, Matches, `^d41d8cd98f00b204e9800998ecf8427e\+0(\+.+)?$`)
 		c.Check(rep, Equals, 2)
 		c.Check(err, Equals, nil)
-		log.Print("Finished PutB zero block")
+		c.Log("Finished PutB zero block")
 	}
 
 	{
@@ -283,7 +315,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		all, err := ioutil.ReadAll(reader)
 		c.Check(all, DeepEquals, []byte(""))
 		c.Check(blocklen, Equals, int64(0))
-		log.Print("Finished Get zero block")
+		c.Log("Finished Get zero block")
 	}
 }
 
@@ -298,7 +330,7 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 		errNotFound, _ := err.(keepclient.ErrNotFound)
 		c.Check(errNotFound, NotNil)
 		c.Assert(strings.Contains(err.Error(), "HTTP 403"), Equals, true)
-		log.Print("Ask 1")
+		c.Log("Ask 1")
 	}
 
 	{
@@ -306,7 +338,7 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 		c.Check(hash2, Equals, "")
 		c.Check(rep, Equals, 0)
 		c.Check(err, FitsTypeOf, keepclient.InsufficientReplicasError(errors.New("")))
-		log.Print("PutB")
+		c.Log("PutB")
 	}
 
 	{
@@ -315,7 +347,7 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 		c.Check(errNotFound, NotNil)
 		c.Assert(strings.Contains(err.Error(), "HTTP 403"), Equals, true)
 		c.Check(blocklen, Equals, int64(0))
-		log.Print("Ask 2")
+		c.Log("Ask 2")
 	}
 
 	{
@@ -324,7 +356,7 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 		c.Check(errNotFound, NotNil)
 		c.Assert(strings.Contains(err.Error(), "HTTP 403"), Equals, true)
 		c.Check(blocklen, Equals, int64(0))
-		log.Print("Get")
+		c.Log("Get")
 	}
 }
 
@@ -339,7 +371,7 @@ func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
 		errNotFound, _ := err.(keepclient.ErrNotFound)
 		c.Check(errNotFound, NotNil)
 		c.Assert(strings.Contains(err.Error(), "HTTP 400"), Equals, true)
-		log.Print("Ask 1")
+		c.Log("Ask 1")
 	}
 
 	{
@@ -347,7 +379,7 @@ func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
 		c.Check(hash2, Matches, fmt.Sprintf(`^%s\+3(\+.+)?$`, hash))
 		c.Check(rep, Equals, 2)
 		c.Check(err, Equals, nil)
-		log.Print("PutB")
+		c.Log("PutB")
 	}
 
 	{
@@ -356,7 +388,7 @@ func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
 		c.Check(errNotFound, NotNil)
 		c.Assert(strings.Contains(err.Error(), "HTTP 400"), Equals, true)
 		c.Check(blocklen, Equals, int64(0))
-		log.Print("Ask 2")
+		c.Log("Ask 2")
 	}
 
 	{
@@ -365,7 +397,7 @@ func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
 		c.Check(errNotFound, NotNil)
 		c.Assert(strings.Contains(err.Error(), "HTTP 400"), Equals, true)
 		c.Check(blocklen, Equals, int64(0))
-		log.Print("Get")
+		c.Log("Get")
 	}
 }
 
@@ -593,3 +625,21 @@ func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
 		c.Check(err, ErrorMatches, `.*HTTP 502.*`)
 	}
 }
+
+func (s *ServerRequiredSuite) TestPing(c *C) {
+	kc := runProxy(c, nil, false)
+	defer closeListener()
+
+	rtr := MakeRESTRouter(true, true, kc, 10*time.Second, arvadostest.ManagementToken)
+
+	req, err := http.NewRequest("GET",
+		"http://"+listener.Addr().String()+"/_health/ping",
+		nil)
+	c.Assert(err, IsNil)
+	req.Header.Set("Authorization", "Bearer "+arvadostest.ManagementToken)
+
+	resp := httptest.NewRecorder()
+	rtr.ServeHTTP(resp, req)
+	c.Check(resp.Code, Equals, 200)
+	c.Assert(strings.Contains(resp.Body.String(), `{"health":"OK"}`), Equals, true)
+}