add --disable-multipart flag to allow testing without multipart (#102)

minio · Apr 30, 2020 · dfa46a6 · dfa46a6
1 parent 87b642f
commit dfa46a6
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 136 deletions.
diff --git a/cli/client.go b/cli/client.go
@@ -173,14 +173,14 @@ func clientTransport(ctx *cli.Context) http.RoundTripper {
 	tr := &http.Transport{
 		Proxy: http.ProxyFromEnvironment,
 		DialContext: (&net.Dialer{
-			Timeout:   5 * time.Second,
-			KeepAlive: 5 * time.Second,
+			Timeout:   10 * time.Second,
+			KeepAlive: 10 * time.Second,
 		}).DialContext,
 		MaxIdleConnsPerHost:   ctx.Int("concurrent"),
 		IdleConnTimeout:       90 * time.Second,
-		TLSHandshakeTimeout:   10 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
-		ResponseHeaderTimeout: time.Minute,
+		TLSHandshakeTimeout:   15 * time.Second,
+		ExpectContinueTimeout: 10 * time.Second,
+		ResponseHeaderTimeout: 2 * time.Minute,
 		// Set this value so that the underlying transport round-tripper
 		// doesn't try to auto decode the body of objects with
 		// content-encoding set to `gzip`.

diff --git a/cli/delete.go b/cli/delete.go
@@ -41,6 +41,10 @@ var (
 			Value: 100,
 			Usage: "Number of DELETE operations per batch.",
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -80,6 +84,7 @@ func mainDelete(ctx *cli.Context) error {
 			Location:    "",
 			PutOpts: minio.PutObjectOptions{
 				ServerSideEncryption: newSSE(ctx),
+				DisableMultipart:     ctx.Bool("disable-multipart"),
 			},
 		},
 		CreateObjects: ctx.Int("objects"),

diff --git a/cli/get.go b/cli/get.go
@@ -36,6 +36,10 @@ var (
 			Value: "10MiB",
 			Usage: "Size of each generated object. Can be a number or 10KiB/MiB/GiB. All sizes are base 2 binary.",
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -74,6 +78,7 @@ func mainGet(ctx *cli.Context) error {
 			Location:    "",
 			PutOpts: minio.PutObjectOptions{
 				ServerSideEncryption: sse,
+				DisableMultipart:     ctx.Bool("disable-multipart"),
 			},
 		},
 		CreateObjects: ctx.Int("objects"),

diff --git a/cli/list.go b/cli/list.go
@@ -36,6 +36,10 @@ var (
 			Value: "1KB",
 			Usage: "Size of each generated object. Can be a number or 10KB/MB/GB. All sizes are base 2 binary.",
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -74,6 +78,7 @@ func mainList(ctx *cli.Context) error {
 			Location:    "",
 			PutOpts: minio.PutObjectOptions{
 				ServerSideEncryption: newSSE(ctx),
+				DisableMultipart:     ctx.Bool("disable-multipart"),
 			},
 		},
 		CreateObjects: ctx.Int("objects"),

diff --git a/cli/mixed.go b/cli/mixed.go
@@ -59,6 +59,10 @@ var (
 			Usage: "The amount of DELETE operations. Must be at least the same as PUT.",
 			Value: 10,
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -107,6 +111,7 @@ func mainMixed(ctx *cli.Context) error {
 			Location:    "",
 			PutOpts: minio.PutObjectOptions{
 				ServerSideEncryption: sse,
+				DisableMultipart:     ctx.Bool("disable-multipart"),
 			},
 		},
 		CreateObjects: ctx.Int("objects"),

diff --git a/cli/put.go b/cli/put.go
@@ -31,6 +31,10 @@ var (
 			Value: "10MiB",
 			Usage: "Size of each generated object. Can be a number or 10KiB/MiB/GiB. All sizes are base 2 binary.",
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -60,15 +64,18 @@ EXAMPLES:
 func mainPut(ctx *cli.Context) error {
 	checkPutSyntax(ctx)
 	src := newGenSource(ctx)
-
+	sse := newSSE(ctx)
 	b := bench.Put{
 		Common: bench.Common{
 			Client:      newClient(ctx),
 			Concurrency: ctx.Int("concurrent"),
 			Source:      src,
 			Bucket:      ctx.String("bucket"),
 			Location:    "",
-			PutOpts:     minio.PutObjectOptions{},
+			PutOpts: minio.PutObjectOptions{
+				ServerSideEncryption: sse,
+				DisableMultipart:     ctx.Bool("disable-multipart"),
+			},
 		},
 	}
 	return runBench(ctx, &b)

diff --git a/cli/select.go b/cli/select.go
@@ -40,6 +40,10 @@ var (
 			Value: "select * from s3object",
 			Usage: "select query expression",
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -78,6 +82,7 @@ func mainSelect(ctx *cli.Context) error {
 			Location:    "",
 			PutOpts: minio.PutObjectOptions{
 				ServerSideEncryption: sse,
+				DisableMultipart:     ctx.Bool("disable-multipart"),
 			},
 		},
 		CreateObjects: ctx.Int("objects"),

diff --git a/cli/stat.go b/cli/stat.go
@@ -36,6 +36,10 @@ var (
 			Value: "1KB",
 			Usage: "Size of each generated object. Can be a number or 10KB/MB/GB. All sizes are base 2 binary.",
 		},
+		cli.BoolFlag{
+			Name:  "disable-multipart",
+			Usage: "disable multipart uploads",
+		},
 	}
 )
 
@@ -75,6 +79,7 @@ func mainStat(ctx *cli.Context) error {
 			Location:    "",
 			PutOpts: minio.PutObjectOptions{
 				ServerSideEncryption: sse,
+				DisableMultipart:     ctx.Bool("disable-multipart"),
 			},
 		},
 		CreateObjects: ctx.Int("objects"),

diff --git a/go.mod b/go.mod
@@ -10,8 +10,8 @@ require (
 	github.com/klauspost/compress v1.10.3
 	github.com/minio/cli v1.22.0
 	github.com/minio/mc v0.0.0-20200201185513-ac9b9423973b
-	github.com/minio/minio v0.0.0-20200409163002-f44cfb2863a1
-	github.com/minio/minio-go/v6 v6.0.52
+	github.com/minio/minio v0.0.0-20200430053134-c7470e6e6eed
+	github.com/minio/minio-go/v6 v6.0.55
 	github.com/pkg/profile v1.3.0
 	github.com/posener/complete v1.2.2-0.20190702141536-6ffe496ea953
 	github.com/secure-io/sio-go v0.3.0