[ARVADOS] updated: 3e4f591181a38d739d94cf9321f874c19937d199

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job               | 59 +++++++++++++++++++++++++++++++++---
 sdk/go/keepclient/keepclient_test.go |  9 ++++--
 services/keepproxy/keepproxy_test.go | 27 +++++++++++++++++
 3 files changed, 87 insertions(+), 8 deletions(-)

       via  3e4f591181a38d739d94cf9321f874c19937d199 (commit)
       via  77b2a1d82d032f7e29f9c477d32127a4435ec13e (commit)
       via  dbf51c6ab20fab93c3f71910c13de9d4a0501bad (commit)
       via  352b2fa89337c6381aee45d173f95e5c7c0653e0 (commit)
       via  7011a3022e1378fcd3897b42f841726459d2fa13 (commit)
       via  38d8d205385181811235502dbad7c6e27fcea2a7 (commit)
       via  dc3915c4eafa0e7c69278de5df659b2b4338f2d2 (commit)
       via  22c45aed63a8c497508b132ca62dac599e3af06f (commit)
      from  7d887106d3eabb9844c4a687403a18581167a823 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3e4f591181a38d739d94cf9321f874c19937d199
Author: radhika <radhika at curoverse.com>
Date:   Sat Oct 24 16:00:38 2015 -0400

    7492: add a keepproxy test with temporary connection refused error.

diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 4acaf70..df46386 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -557,8 +557,10 @@ func (s *StandaloneSuite) TestGetFail(c *C) {
 	kc.Retries = 0
 
 	r, n, url2, err := kc.Get(hash)
-	errNotFound, _ := err.(ErrNotFound)
+	errNotFound, _ := err.(*ErrNotFound)
 	c.Check(errNotFound, NotNil)
+	c.Check(strings.Contains(errNotFound.Error(), "HTTP 500"), Equals, true)
+	c.Check(errNotFound.Temporary(), Equals, true)
 	c.Check(n, Equals, int64(0))
 	c.Check(url2, Equals, "")
 	c.Check(r, Equals, nil)
@@ -603,9 +605,10 @@ func (s *StandaloneSuite) TestGetNetError(c *C) {
 	kc.SetServiceRoots(map[string]string{"x": "http://localhost:62222"}, nil, nil)
 
 	r, n, url2, err := kc.Get(hash)
-	errNotFound, _ := err.(ErrNotFound)
+	errNotFound, _ := err.(*ErrNotFound)
 	c.Check(errNotFound, NotNil)
-	c.Check(strings.Contains(err.Error(), "connection refused"), Equals, true)
+	c.Check(strings.Contains(errNotFound.Error(), "connection refused"), Equals, true)
+	c.Check(errNotFound.Temporary(), Equals, true)
 	c.Check(n, Equals, int64(0))
 	c.Check(url2, Equals, "")
 	c.Check(r, Equals, nil)
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index e0d4a79..6303122 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -518,3 +518,30 @@ func (s *ServerRequiredSuite) TestPutAskGetInvalidToken(c *C) {
 		c.Assert(strings.Contains(err.Error(), "HTTP 403 \"Missing or invalid Authorization header\""), Equals, true)
 	}
 }
+
+func (s *ServerRequiredSuite) TestPutAskGetConnectionError(c *C) {
+	arv, err := arvadosclient.MakeArvadosClient()
+	c.Assert(err, Equals, nil)
+
+	// keepclient with no such keep server
+	kc := keepclient.New(&arv)
+	locals := map[string]string{
+		"proxy": "http://localhost:12345",
+	}
+	kc.SetServiceRoots(locals, nil, nil)
+
+	// Ask should result in temporary connection refused error
+	hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
+	_, _, err = kc.Ask(hash)
+	c.Check(err, NotNil)
+	errNotFound, _ := err.(*keepclient.ErrNotFound)
+	c.Check(errNotFound.Temporary(), Equals, true)
+	c.Assert(strings.Contains(err.Error(), "connection refused"), Equals, true)
+
+	// Get should result in temporary connection refused error
+	_, _, _, err = kc.Get(hash)
+	c.Check(err, NotNil)
+	errNotFound, _ = err.(*keepclient.ErrNotFound)
+	c.Check(errNotFound.Temporary(), Equals, true)
+	c.Assert(strings.Contains(err.Error(), "connection refused"), Equals, true)
+}

commit 77b2a1d82d032f7e29f9c477d32127a4435ec13e
Merge: 7d88710 dbf51c6
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 23 17:28:07 2015 -0400

    Merge branch 'master' into 7492-keepproxy-upstream-errors


-----------------------------------------------------------------------


hooks/post-receive
--