[ARVADOS] created: 2.1.0-1094-g53f54e1b9

[Git user]

        at  53f54e1b9f424b391c8b4d2aac3c4ae8ea4fc198 (commit)


commit 53f54e1b9f424b391c8b4d2aac3c4ae8ea4fc198
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Jul 22 17:30:51 2021 -0300

    16665: Wraps error type to be able to differentiate it in a case switch.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index 2cd6bb4d4..3bc6f4afc 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -69,11 +69,11 @@ type ErrNotFound struct {
 	multipleResponseError
 }
 
-type InsufficientReplicasError error
+type InsufficientReplicasError struct{ error }
 
-type OversizeBlockError error
+type OversizeBlockError struct{ error }
 
-var ErrOversizeBlock = OversizeBlockError(errors.New("Exceeded maximum block size (" + strconv.Itoa(BLOCKSIZE) + ")"))
+var ErrOversizeBlock = OversizeBlockError{error: errors.New("Exceeded maximum block size (" + strconv.Itoa(BLOCKSIZE) + ")")}
 var MissingArvadosApiHost = errors.New("Missing required environment variable ARVADOS_API_HOST")
 var MissingArvadosApiToken = errors.New("Missing required environment variable ARVADOS_API_TOKEN")
 var InvalidLocatorError = errors.New("Invalid locator")
diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index a8c82aac0..633ec1896 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -255,7 +255,7 @@ func (kc *KeepClient) BlockWrite(ctx context.Context, req arvados.BlockWriteOpti
 							msg += resp + "; "
 						}
 						msg = msg[:len(msg)-2]
-						return resp, InsufficientReplicasError(errors.New(msg))
+						return resp, InsufficientReplicasError{error: errors.New(msg)}
 					}
 					break
 				}
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index f02971d61..4bdb42020 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -7,7 +7,6 @@ package main
 import (
 	"bytes"
 	"crypto/md5"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
@@ -442,7 +441,7 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 	hash2, rep, err := kc.PutB([]byte("bar"))
 	c.Check(hash2, Equals, "")
 	c.Check(rep, Equals, 0)
-	c.Check(err, FitsTypeOf, keepclient.InsufficientReplicasError(errors.New("")))
+	c.Check(err, FitsTypeOf, keepclient.InsufficientReplicasError{})
 
 	blocklen, _, err := kc.Ask(hash)
 	c.Check(err, FitsTypeOf, &keepclient.ErrNotFound{})
@@ -495,7 +494,7 @@ func testPermission(c *C, admin bool, perm arvados.UploadDownloadPermission) {
 		} else {
 			c.Check(hash2, Equals, "")
 			c.Check(rep, Equals, 0)
-			c.Check(err, FitsTypeOf, keepclient.InsufficientReplicasError(errors.New("")))
+			c.Check(err, FitsTypeOf, keepclient.InsufficientReplicasError{})
 		}
 		logbuf.Reset()
 	}

commit 7533276a8b444ac3d49f74c8da0fb31d8caf2650
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Jul 22 17:24:26 2021 -0300

    16665: Exposes bug through updated test.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index c49fbe0bb..f02971d61 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -265,12 +265,16 @@ func (s *ServerRequiredSuite) TestDesiredReplicas(c *C) {
 	content := []byte("TestDesiredReplicas")
 	hash := fmt.Sprintf("%x", md5.Sum(content))
 
-	for _, kc.Want_replicas = range []int{0, 1, 2} {
+	for _, kc.Want_replicas = range []int{0, 1, 2, 3} {
 		locator, rep, err := kc.PutB(content)
-		c.Check(err, Equals, nil)
-		c.Check(rep, Equals, kc.Want_replicas)
-		if rep > 0 {
-			c.Check(locator, Matches, fmt.Sprintf(`^%s\+%d(\+.+)?$`, hash, len(content)))
+		if kc.Want_replicas < 3 {
+			c.Check(err, Equals, nil)
+			c.Check(rep, Equals, kc.Want_replicas)
+			if rep > 0 {
+				c.Check(locator, Matches, fmt.Sprintf(`^%s\+%d(\+.+)?$`, hash, len(content)))
+			}
+		} else {
+			c.Check(err, ErrorMatches, ".*503.*")
 		}
 	}
 }

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


hooks/post-receive
--