[ARVADOS] updated: 1.2.0-166-g282536bbd

Git user git at public.curoverse.com
Tue Oct 9 16:08:39 EDT 2018


Summary of changes:
 sdk/go/keepclient/discover.go                      |  14 ++-
 services/keepstore/azure_blob_volume_test.go       |  14 ++-
 services/keepstore/handlers.go                     |   2 +-
 services/keepstore/proxy_remote.go                 | 105 ++++++++++++++++--
 services/keepstore/proxy_remote_test.go            | 118 +++++++++++++++++----
 services/keepstore/pull_worker_integration_test.go |   2 +-
 6 files changed, 219 insertions(+), 36 deletions(-)

       via  282536bbd088d06455053e4599051ad6352728b9 (commit)
       via  b117de413113ab28e2f2e5a2ebd73830fcef96dc (commit)
       via  79a9d03d3470ef013a908051a2bccddc680ecb5c (commit)
       via  77ee37c567ba73a0c33455ecf8d5c8200cf69d72 (commit)
       via  13fc31b65d1fa7e737d0e3ce345b3d556d14af16 (commit)
       via  3b2f0608f7db14524c6afd4a7608e09de8973f96 (commit)
       via  005951a5e62a55894eace6e8fb3fe91d5c4ba84c (commit)
       via  fde27ce0e46521db9828c228e7fb531e003724a8 (commit)
       via  1e27ecf1368de5932c4af00c6cff9595c501f5f6 (commit)
       via  a1745a13f68363598cc121b617436f3ac5b1654d (commit)
      from  8d73164d5ca50e7af1b3752b4251eaf9f11a9fc8 (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 282536bbd088d06455053e4599051ad6352728b9
Merge: 8d73164d5 b117de413
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 9 16:07:44 2018 -0400

    Merge branch '14199-copy-from-remote'
    
    refs #14199
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit b117de413113ab28e2f2e5a2ebd73830fcef96dc
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 9 16:07:17 2018 -0400

    14199: Reduce logging noise from azure test stubs.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keepstore/azure_blob_volume_test.go b/services/keepstore/azure_blob_volume_test.go
index 1cb6dc380..85d0a1eea 100644
--- a/services/keepstore/azure_blob_volume_test.go
+++ b/services/keepstore/azure_blob_volume_test.go
@@ -18,6 +18,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"regexp"
 	"sort"
 	"strconv"
@@ -40,7 +41,10 @@ const (
 	fakeAccountKey  = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
 )
 
-var azureTestContainer string
+var (
+	azureTestContainer string
+	azureTestDebug     = os.Getenv("ARVADOS_DEBUG") != ""
+)
 
 func init() {
 	flag.StringVar(
@@ -109,7 +113,9 @@ var rangeRegexp = regexp.MustCompile(`^bytes=(\d+)-(\d+)$`)
 func (h *azStubHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	h.Lock()
 	defer h.Unlock()
-	// defer log.Printf("azStubHandler: %+v", r)
+	if azureTestDebug {
+		defer log.Printf("azStubHandler: %+v", r)
+	}
 
 	path := strings.Split(r.URL.Path, "/")
 	container := path[1]
@@ -340,7 +346,9 @@ var localHostPortRe = regexp.MustCompile(`(127\.0\.0\.1|localhost|\[::1\]):\d+`)
 
 func (d *azStubDialer) Dial(network, address string) (net.Conn, error) {
 	if hp := localHostPortRe.FindString(address); hp != "" {
-		log.Println("azStubDialer: dial", hp, "instead of", address)
+		if azureTestDebug {
+			log.Println("azStubDialer: dial", hp, "instead of", address)
+		}
 		address = hp
 	}
 	return d.Dialer.Dial(network, address)

commit 79a9d03d3470ef013a908051a2bccddc680ecb5c
Merge: 77ee37c56 8d73164d5
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 9 15:56:26 2018 -0400

    14199: Merge branch 'master' into 14199-copy-from-remote
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list