X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d158890921e8821782420711513a8b28ce0a1280..ca06cfbda0e84d469f7810a280cfa4dfa8997260:/tools/keep-exercise/keep-exercise.go

diff --git a/tools/keep-exercise/keep-exercise.go b/tools/keep-exercise/keep-exercise.go
index 4131d752b8..d5386b0ef5 100644
--- a/tools/keep-exercise/keep-exercise.go
+++ b/tools/keep-exercise/keep-exercise.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 // Testing tool for Keep services.
 //
 // keepexercise helps measure throughput and test reliability under
@@ -18,13 +22,17 @@ import (
 	"crypto/rand"
 	"encoding/binary"
 	"flag"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
+	"net/http"
+	"os"
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	arvadosVersion "git.curoverse.com/arvados.git/sdk/go/version"
 )
 
 // Command line config knobs
@@ -38,11 +46,20 @@ var (
 	StatsInterval = flag.Duration("stats-interval", time.Second, "time interval between IO stats reports, or 0 to disable")
 	ServiceURL    = flag.String("url", "", "specify scheme://host of a single keep service to exercise (instead of using all advertised services like normal clients)")
 	ServiceUUID   = flag.String("uuid", "", "specify UUID of a single advertised keep service to exercise")
+	getVersion    = flag.Bool("version", false, "Print version information and exit.")
 )
 
 func main() {
 	flag.Parse()
 
+	// Print version information if requested
+	if *getVersion {
+		fmt.Printf("Version: %s\n", arvadosVersion.GetVersion())
+		os.Exit(0)
+	}
+
+	log.Printf("keep-exercise %q started", arvadosVersion.GetVersion())
+
 	arv, err := arvadosclient.MakeArvadosClient()
 	if err != nil {
 		log.Fatal(err)
@@ -52,15 +69,21 @@ func main() {
 		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 +129,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 +167,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 {