X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/908261de15c98553a4200f01aff1f26ef57c8fb8..3b3c3a0869c2cf528b9e1c45c969bbbd47f6446e:/tools/keep-exercise/keep-exercise.go

diff --git a/tools/keep-exercise/keep-exercise.go b/tools/keep-exercise/keep-exercise.go
index 9dc8f9425a..a4684739e7 100644
--- a/tools/keep-exercise/keep-exercise.go
+++ b/tools/keep-exercise/keep-exercise.go
@@ -21,6 +21,7 @@ import (
 	"io"
 	"io/ioutil"
 	"log"
+	"net/http"
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
@@ -47,20 +48,26 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	kc, err := keepclient.MakeKeepClient(&arv)
+	kc, err := keepclient.MakeKeepClient(arv)
 	if err != nil {
 		log.Fatal(err)
 	}
 	kc.Want_replicas = *Replicas
-	kc.Client.Timeout = 10 * time.Minute
+
+	transport := *(http.DefaultTransport.(*http.Transport))
+	transport.TLSClientConfig = arvadosclient.MakeTLSConfig(arv.ApiInsecure)
+	kc.HTTPClient = &http.Client{
+		Timeout:   10 * time.Minute,
+		Transport: &transport,
+	}
 
 	overrideServices(kc)
 
-	nextBuf := make(chan []byte, *WriteThreads)
 	nextLocator := make(chan string, *ReadThreads+*WriteThreads)
 
 	go countBeans(nextLocator)
 	for i := 0; i < *WriteThreads; i++ {
+		nextBuf := make(chan []byte, 1)
 		go makeBufs(nextBuf, i)
 		go doWrites(kc, nextBuf, nextLocator)
 	}
@@ -106,23 +113,28 @@ func countBeans(nextLocator chan string) {
 	}
 }
 
-func makeBufs(nextBuf chan []byte, threadID int) {
+func makeBufs(nextBuf chan<- []byte, threadID int) {
 	buf := make([]byte, *BlockSize)
 	if *VaryThread {
 		binary.PutVarint(buf, int64(threadID))
 	}
+	randSize := 524288
+	if randSize > *BlockSize {
+		randSize = *BlockSize
+	}
 	for {
 		if *VaryRequest {
-			buf = make([]byte, *BlockSize)
-			if _, err := io.ReadFull(rand.Reader, buf); err != nil {
+			rnd := make([]byte, randSize)
+			if _, err := io.ReadFull(rand.Reader, rnd); err != nil {
 				log.Fatal(err)
 			}
+			buf = append(rnd, buf[randSize:]...)
 		}
 		nextBuf <- buf
 	}
 }
 
-func doWrites(kc *keepclient.KeepClient, nextBuf chan []byte, nextLocator chan string) {
+func doWrites(kc *keepclient.KeepClient, nextBuf <-chan []byte, nextLocator chan<- string) {
 	for buf := range nextBuf {
 		locator, _, err := kc.PutB(buf)
 		if err != nil {
@@ -139,7 +151,7 @@ func doWrites(kc *keepclient.KeepClient, nextBuf chan []byte, nextLocator chan s
 	}
 }
 
-func doReads(kc *keepclient.KeepClient, nextLocator chan string) {
+func doReads(kc *keepclient.KeepClient, nextLocator <-chan string) {
 	for locator := range nextLocator {
 		rdr, size, url, err := kc.Get(locator)
 		if err != nil {