Skip to content

Commit

Permalink
Update MinIO to RELEASE.2021-03-04T00-53-13Z
Browse files Browse the repository at this point in the history 
The main motivation is to resolve a build issue on macOS, but we also
haven't updated MinIO for quite a while.

Change-Id: Ie34172abd25eaa464755d4573e3dd63fcf2936fe
  • Loading branch information
@kaloyan-raev
kaloyan-raev committed Apr 16, 2021
1 parent f5d7431 commit 94113ad
Show file tree
Hide file tree
Showing 8 changed files with 593 additions and 379 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GO_VERSION ?= 1.16
GO_VERSION ?= 1.15.7
GOOS ?= linux
GOARCH ?= amd64
GOPATH ?= $(shell go env GOPATH)
Expand Down
8 changes: 3 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ require (
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
github.com/calebcase/tmpfile v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/minio/cli v1.22.0
github.com/minio/minio v0.0.0-20201125204248-91130e884b5d
github.com/minio/minio v0.0.0-20210304002810-c3217bd6ebc0
github.com/minio/minio-go/v6 v6.0.58-0.20200612001654-a57fec8037ec
github.com/spacemonkeygo/monkit/v3 v3.0.10
github.com/spf13/cobra v1.0.0
Expand All @@ -18,8 +17,7 @@ require (
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
google.golang.org/api v0.20.0 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
storj.io/common v0.0.0-20210413145726-6095a5c22253
storj.io/common v0.0.0-20210412024514-5bcb1fff421e
storj.io/private v0.0.0-20210403210935-5fd57695864c
storj.io/uplink v1.4.6-0.20210413130107-fb1630dc35a6
storj.io/uplink v1.4.6
)
437 changes: 309 additions & 128 deletions go.sum
View file

Large diffs are not rendered by default.

36 changes: 4 additions & 32 deletions miniogw/gateway.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,34 +207,6 @@ func rangeSpecToDownloadOptions(spec *minio.HTTPRangeSpec) (opts *uplink.Downloa
}
}

func (layer *gatewayLayer) GetObject(ctx context.Context, bucketName, objectPath string, startOffset int64, length int64, writer io.Writer, etag string, opts minio.ObjectOptions) (err error) {
defer mon.Task()(&ctx)(&err)

download, err := layer.project.DownloadObject(ctx, bucketName, objectPath, &uplink.DownloadOptions{
Offset: startOffset,
Length: length,
})
if err != nil {
// TODO this should be removed and implemented on satellite side
err = checkBucketError(ctx, layer.project, bucketName, objectPath, err)
return convertError(err, bucketName, objectPath)
}
defer func() { err = errs.Combine(err, download.Close()) }()

object := download.Info()
if startOffset < 0 || length < -1 {
return minio.InvalidRange{
OffsetBegin: startOffset,
OffsetEnd: startOffset + length,
ResourceSize: object.System.ContentLength,
}
}

_, err = io.Copy(writer, download)

return convertError(err, bucketName, objectPath)
}

func (layer *gatewayLayer) GetObjectInfo(ctx context.Context, bucketName, objectPath string, opts minio.ObjectOptions) (objInfo minio.ObjectInfo, err error) {
defer mon.Task()(&ctx)(&err)

Expand Down Expand Up @@ -595,7 +567,7 @@ func (layer *gatewayLayer) CopyObject(ctx context.Context, srcBucket, srcObject,
return minio.ObjectInfo{}, convertError(err, destBucket, destObject)
}

reader, err := hash.NewReader(download, info.System.ContentLength, "", "", info.System.ContentLength, true)
reader, err := hash.NewReader(download, info.System.ContentLength, "", "", info.System.ContentLength)
if err != nil {
abortErr := upload.Abort()
err = errs.Combine(err, abortErr)
Expand Down Expand Up @@ -651,11 +623,11 @@ func (layer *gatewayLayer) PutObject(ctx context.Context, bucketName, objectPath
defer layer.active.remove(bucketName, objectPath)

if data == nil {
hashReader, err := hash.NewReader(bytes.NewReader([]byte{}), 0, "", "", 0, true)
hashReader, err := hash.NewReader(bytes.NewReader([]byte{}), 0, "", "", 0)
if err != nil {
return minio.ObjectInfo{}, convertError(err, bucketName, objectPath)
}
data = minio.NewPutObjReader(hashReader, nil, nil)
data = minio.NewPutObjReader(hashReader)
}

upload, err := layer.project.UploadObject(ctx, bucketName, objectPath, nil)
Expand Down Expand Up @@ -694,7 +666,7 @@ func (layer *gatewayLayer) Shutdown(ctx context.Context) (err error) {
return layer.project.Close()
}

func (layer *gatewayLayer) StorageInfo(ctx context.Context, local bool) (minio.StorageInfo, []error) {
func (layer *gatewayLayer) StorageInfo(ctx context.Context) (minio.StorageInfo, []error) {
info := minio.StorageInfo{}
info.Backend.Type = minio.BackendGateway
info.Backend.GatewayOnline = layer.isSatelliteOnline(ctx)
Expand Down
20 changes: 5 additions & 15 deletions miniogw/logging.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package miniogw

import (
"context"
"io"
"net/http"
"reflect"

Expand Down Expand Up @@ -70,8 +69,8 @@ func (log *layerLogging) Shutdown(ctx context.Context) error {
return log.log(log.layer.Shutdown(ctx))
}

func (log *layerLogging) StorageInfo(ctx context.Context, local bool) (minio.StorageInfo, []error) {
return log.layer.StorageInfo(ctx, local)
func (log *layerLogging) StorageInfo(ctx context.Context) (minio.StorageInfo, []error) {
return log.layer.StorageInfo(ctx)
}

func (log *layerLogging) MakeBucketWithLocation(ctx context.Context, bucket string, opts minio.BucketOptions) error {
Expand Down Expand Up @@ -108,10 +107,6 @@ func (log *layerLogging) GetObjectNInfo(ctx context.Context, bucket, object stri
return reader, log.log(err)
}

func (log *layerLogging) GetObject(ctx context.Context, bucket, object string, startOffset int64, length int64, writer io.Writer, etag string, opts minio.ObjectOptions) (err error) {
return log.log(log.layer.GetObject(ctx, bucket, object, startOffset, length, writer, etag, opts))
}

func (log *layerLogging) GetObjectInfo(ctx context.Context, bucket, object string, opts minio.ObjectOptions) (objInfo minio.ObjectInfo, err error) {
objInfo, err = log.layer.GetObjectInfo(ctx, bucket, object, opts)
return objInfo, log.log(err)
Expand Down Expand Up @@ -184,8 +179,8 @@ func (log *layerLogging) HealFormat(ctx context.Context, dryRun bool) (madmin.He
return rv, log.log(err)
}

func (log *layerLogging) HealBucket(ctx context.Context, bucket string, dryRun, remove bool) (madmin.HealResultItem, error) {
rv, err := log.layer.HealBucket(ctx, bucket, dryRun, remove)
func (log *layerLogging) HealBucket(ctx context.Context, bucket string, opts madmin.HealOpts) (madmin.HealResultItem, error) {
rv, err := log.layer.HealBucket(ctx, bucket, opts)
return rv, log.log(err)
}

Expand All @@ -194,11 +189,6 @@ func (log *layerLogging) HealObject(ctx context.Context, bucket, object, version
return rv, log.log(err)
}

func (log *layerLogging) ListBucketsHeal(ctx context.Context) (buckets []minio.BucketInfo, err error) {
buckets, err = log.layer.ListBucketsHeal(ctx)
return buckets, log.log(err)
}

func (log *layerLogging) SetBucketPolicy(ctx context.Context, n string, p *policy.Policy) error {
return log.log(log.layer.SetBucketPolicy(ctx, n, p))
}
Expand All @@ -224,7 +214,7 @@ func (log *layerLogging) IsCompressionSupported() bool {
return log.layer.IsCompressionSupported()
}

func (log *layerLogging) GetMetrics(ctx context.Context) (*minio.Metrics, error) {
func (log *layerLogging) GetMetrics(ctx context.Context) (*minio.BackendMetrics, error) {
metrics, err := log.layer.GetMetrics(ctx)
return metrics, log.log(err)
}
6 changes: 3 additions & 3 deletions testsuite/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ replace storj.io/gateway => ../

require (
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
github.com/minio/minio v0.0.0-20201125204248-91130e884b5d
github.com/minio/minio v0.0.0-20210304002810-c3217bd6ebc0
github.com/stretchr/testify v1.7.0
github.com/zeebo/errs v1.2.2
go.uber.org/zap v1.16.0
storj.io/common v0.0.0-20210413145726-6095a5c22253
storj.io/common v0.0.0-20210412024514-5bcb1fff421e
storj.io/gateway v0.0.0-00010101000000-000000000000
storj.io/storj v0.12.1-0.20210413193432-c3f8e067987f
storj.io/uplink v1.4.6-0.20210413130107-fb1630dc35a6
storj.io/uplink v1.4.6
)
Loading

0 comments on commit 94113ad

Please sign in to comment.