MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Run staticcheck on CI (#16170)

Browse Source
This commit is contained in:
Klaus Post 2022-12-05 20:18:50 +01:00 committed by GitHub
parent a9f5b58a01
commit a713aee3d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 140 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -22,6 +22,7 @@ getdeps: ## fetch necessary dependencies
@echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin @echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin
@echo "Installing msgp" && go install -v github.com/tinylib/msgp@f3635b96e4838a6c773babb65ef35297fe5fe2f9 @echo "Installing msgp" && go install -v github.com/tinylib/msgp@f3635b96e4838a6c773babb65ef35297fe5fe2f9
@echo "Installing stringer" && go install -v golang.org/x/tools/cmd/stringer@latest @echo "Installing stringer" && go install -v golang.org/x/tools/cmd/stringer@latest
@echo "Installing staticcheck" && go install honnef.co/go/tools/cmd/staticcheck@latest
crosscompile: ## cross compile minio crosscompile: ## cross compile minio
@(env bash $(PWD)/buildscripts/cross-compile.sh) @(env bash $(PWD)/buildscripts/cross-compile.sh)
@ -35,6 +36,7 @@ check-gen: ## check for updated autogenerated files
lint: ## runs golangci-lint suite of linters lint: ## runs golangci-lint suite of linters
@echo "Running $@ check" @echo "Running $@ check"
@${GOPATH}/bin/golangci-lint run --build-tags kqueue --timeout=10m --config ./.golangci.yml @${GOPATH}/bin/golangci-lint run --build-tags kqueue --timeout=10m --config ./.golangci.yml
@${GOPATH}/bin/staticcheck --tests=false ./...
check: test check: test
test: verifiers build ## builds minio, runs linters, tests test: verifiers build ## builds minio, runs linters, tests

2
cmd/admin-server-info.go
View File

@ -34,7 +34,6 @@ import (
// getLocalServerProperty - returns madmin.ServerProperties for only the // getLocalServerProperty - returns madmin.ServerProperties for only the
// local endpoints from given list of endpoints // local endpoints from given list of endpoints
func getLocalServerProperty(endpointServerPools EndpointServerPools, r *http.Request) madmin.ServerProperties { func getLocalServerProperty(endpointServerPools EndpointServerPools, r *http.Request) madmin.ServerProperties {
var localEndpoints Endpoints
addr := globalLocalNodeName addr := globalLocalNodeName
if r != nil { if r != nil {
addr = r.Host addr = r.Host
@ -52,7 +51,6 @@ func getLocalServerProperty(endpointServerPools EndpointServerPools, r *http.Req
if endpoint.IsLocal { if endpoint.IsLocal {
// Only proceed for local endpoints // Only proceed for local endpoints
network[nodeName] = string(madmin.ItemOnline) network[nodeName] = string(madmin.ItemOnline)
localEndpoints = append(localEndpoints, endpoint)
continue continue
} }
_, present := network[nodeName] _, present := network[nodeName]

6
cmd/api-errors.go
View File

@ -2267,11 +2267,7 @@ func toAPIError(ctx context.Context, err error) APIError {
// their internal error types. // their internal error types.
switch e := err.(type) { switch e := err.(type) {
case batchReplicationJobError: case batchReplicationJobError:
apiErr = APIError{ apiErr = APIError(e)
Code: e.Code,
Description: e.Description,
HTTPStatusCode: e.HTTPStatusCode,
}
case InvalidArgument: case InvalidArgument:
apiErr = APIError{ apiErr = APIError{
Code: "InvalidArgument", Code: "InvalidArgument",

2
cmd/bucket-lifecycle.go
View File

@ -540,7 +540,7 @@ type RestoreObjectRequest struct {
XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ RestoreRequest" json:"-"` XMLName xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ RestoreRequest" json:"-"`
Days int `xml:"Days,omitempty"` Days int `xml:"Days,omitempty"`
Type RestoreRequestType `xml:"Type,omitempty"` Type RestoreRequestType `xml:"Type,omitempty"`
Tier string `xml:"Tier,-"` Tier string `xml:"Tier"`
Description string `xml:"Description,omitempty"` Description string `xml:"Description,omitempty"`
SelectParameters *SelectParameters `xml:"SelectParameters,omitempty"` SelectParameters *SelectParameters `xml:"SelectParameters,omitempty"`
OutputLocation OutputLocation `xml:"OutputLocation,omitempty"` OutputLocation OutputLocation `xml:"OutputLocation,omitempty"`

65
cmd/bucket-replication.go
View File

@ -36,7 +36,6 @@ import (
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/minio/madmin-go" "github.com/minio/madmin-go"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
miniogo "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/encrypt" "github.com/minio/minio-go/v7/pkg/encrypt"
"github.com/minio/minio-go/v7/pkg/tags" "github.com/minio/minio-go/v7/pkg/tags"
"github.com/minio/minio/internal/bucket/bandwidth" "github.com/minio/minio/internal/bucket/bandwidth"
@ -568,9 +567,9 @@ func replicateDeleteToTarget(ctx context.Context, dobj DeletedObjectReplicationI
} }
// early return if already replicated delete marker for existing object replication/ healing delete markers // early return if already replicated delete marker for existing object replication/ healing delete markers
if dobj.DeleteMarkerVersionID != "" { if dobj.DeleteMarkerVersionID != "" {
toi, err := tgt.StatObject(ctx, tgt.Bucket, dobj.ObjectName, miniogo.StatObjectOptions{ toi, err := tgt.StatObject(ctx, tgt.Bucket, dobj.ObjectName, minio.StatObjectOptions{
VersionID: versionID, VersionID: versionID,
Internal: miniogo.AdvancedGetOptions{ Internal: minio.AdvancedGetOptions{
ReplicationProxyRequest: "false", ReplicationProxyRequest: "false",
IsReplicationReadyForDeleteMarker: true, IsReplicationReadyForDeleteMarker: true,
}, },
@ -589,12 +588,12 @@ func replicateDeleteToTarget(ctx context.Context, dobj DeletedObjectReplicationI
} }
} }
rmErr := tgt.RemoveObject(ctx, tgt.Bucket, dobj.ObjectName, miniogo.RemoveObjectOptions{ rmErr := tgt.RemoveObject(ctx, tgt.Bucket, dobj.ObjectName, minio.RemoveObjectOptions{
VersionID: versionID, VersionID: versionID,
Internal: miniogo.AdvancedRemoveOptions{ Internal: minio.AdvancedRemoveOptions{
ReplicationDeleteMarker: dobj.DeleteMarkerVersionID != "", ReplicationDeleteMarker: dobj.DeleteMarkerVersionID != "",
ReplicationMTime: dobj.DeleteMarkerMTime.Time, ReplicationMTime: dobj.DeleteMarkerMTime.Time,
ReplicationStatus: miniogo.ReplicationStatusReplica, ReplicationStatus: minio.ReplicationStatusReplica,
ReplicationRequest: true, // always set this to distinguish between `mc mirror` replication and serverside ReplicationRequest: true, // always set this to distinguish between `mc mirror` replication and serverside
}, },
}) })
@ -680,7 +679,7 @@ func (m caseInsensitiveMap) Lookup(key string) (string, bool) {
return "", false return "", false
} }
func putReplicationOpts(ctx context.Context, sc string, objInfo ObjectInfo) (putOpts miniogo.PutObjectOptions, err error) { func putReplicationOpts(ctx context.Context, sc string, objInfo ObjectInfo) (putOpts minio.PutObjectOptions, err error) {
meta := make(map[string]string) meta := make(map[string]string)
for k, v := range objInfo.UserDefined { for k, v := range objInfo.UserDefined {
if strings.HasPrefix(strings.ToLower(k), ReservedMetadataPrefixLower) { if strings.HasPrefix(strings.ToLower(k), ReservedMetadataPrefixLower) {
@ -695,14 +694,14 @@ func putReplicationOpts(ctx context.Context, sc string, objInfo ObjectInfo) (put
if sc == "" && (objInfo.StorageClass == storageclass.STANDARD || objInfo.StorageClass == storageclass.RRS) { if sc == "" && (objInfo.StorageClass == storageclass.STANDARD || objInfo.StorageClass == storageclass.RRS) {
sc = objInfo.StorageClass sc = objInfo.StorageClass
} }
putOpts = miniogo.PutObjectOptions{ putOpts = minio.PutObjectOptions{
UserMetadata: meta, UserMetadata: meta,
ContentType: objInfo.ContentType, ContentType: objInfo.ContentType,
ContentEncoding: objInfo.ContentEncoding, ContentEncoding: objInfo.ContentEncoding,
StorageClass: sc, StorageClass: sc,
Internal: miniogo.AdvancedPutOptions{ Internal: minio.AdvancedPutOptions{
SourceVersionID: objInfo.VersionID, SourceVersionID: objInfo.VersionID,
ReplicationStatus: miniogo.ReplicationStatusReplica, ReplicationStatus: minio.ReplicationStatusReplica,
SourceMTime: objInfo.ModTime, SourceMTime: objInfo.ModTime,
SourceETag: objInfo.ETag, SourceETag: objInfo.ETag,
ReplicationRequest: true, // always set this to distinguish between `mc mirror` replication and serverside ReplicationRequest: true, // always set this to distinguish between `mc mirror` replication and serverside
@ -735,7 +734,7 @@ func putReplicationOpts(ctx context.Context, sc string, objInfo ObjectInfo) (put
putOpts.CacheControl = cc putOpts.CacheControl = cc
} }
if mode, ok := lkMap.Lookup(xhttp.AmzObjectLockMode); ok { if mode, ok := lkMap.Lookup(xhttp.AmzObjectLockMode); ok {
rmode := miniogo.RetentionMode(mode) rmode := minio.RetentionMode(mode)
putOpts.Mode = rmode putOpts.Mode = rmode
} }
if retainDateStr, ok := lkMap.Lookup(xhttp.AmzObjectLockRetainUntilDate); ok { if retainDateStr, ok := lkMap.Lookup(xhttp.AmzObjectLockRetainUntilDate); ok {
@ -758,7 +757,7 @@ func putReplicationOpts(ctx context.Context, sc string, objInfo ObjectInfo) (put
putOpts.Internal.RetentionTimestamp = retTimestamp putOpts.Internal.RetentionTimestamp = retTimestamp
} }
if lhold, ok := lkMap.Lookup(xhttp.AmzObjectLockLegalHold); ok { if lhold, ok := lkMap.Lookup(xhttp.AmzObjectLockLegalHold); ok {
putOpts.LegalHold = miniogo.LegalHoldStatus(lhold) putOpts.LegalHold = minio.LegalHoldStatus(lhold)
// set legalhold timestamp in opts // set legalhold timestamp in opts
lholdTimestamp := objInfo.ModTime lholdTimestamp := objInfo.ModTime
if lholdTmstampStr, ok := objInfo.UserDefined[ReservedMetadataPrefixLower+ObjectLockLegalHoldTimestamp]; ok { if lholdTmstampStr, ok := objInfo.UserDefined[ReservedMetadataPrefixLower+ObjectLockLegalHoldTimestamp]; ok {
@ -1126,7 +1125,7 @@ func (ri ReplicateObjectInfo) replicateObject(ctx context.Context, objectAPI Obj
rinfo.Size = size rinfo.Size = size
rinfo.ReplicationAction = rAction rinfo.ReplicationAction = rAction
// use core client to avoid doing multipart on PUT // use core client to avoid doing multipart on PUT
c := &miniogo.Core{Client: tgt.Client} c := &minio.Core{Client: tgt.Client}
putOpts, err := putReplicationOpts(ctx, tgt.StorageClass, objInfo) putOpts, err := putReplicationOpts(ctx, tgt.StorageClass, objInfo)
if err != nil { if err != nil {
@ -1271,9 +1270,9 @@ func (ri ReplicateObjectInfo) replicateAll(ctx context.Context, objectAPI Object
}() }()
rAction = replicateAll rAction = replicateAll
oi, cerr := tgt.StatObject(ctx, tgt.Bucket, object, miniogo.StatObjectOptions{ oi, cerr := tgt.StatObject(ctx, tgt.Bucket, object, minio.StatObjectOptions{
VersionID: objInfo.VersionID, VersionID: objInfo.VersionID,
Internal: miniogo.AdvancedGetOptions{ Internal: minio.AdvancedGetOptions{
ReplicationProxyRequest: "false", ReplicationProxyRequest: "false",
}, },
}) })
@ -1309,16 +1308,16 @@ func (ri ReplicateObjectInfo) replicateAll(ctx context.Context, objectAPI Object
rinfo.Size = size rinfo.Size = size
rinfo.ReplicationAction = rAction rinfo.ReplicationAction = rAction
// use core client to avoid doing multipart on PUT // use core client to avoid doing multipart on PUT
c := &miniogo.Core{Client: tgt.Client} c := &minio.Core{Client: tgt.Client}
if rAction != replicateAll { if rAction != replicateAll {
// replicate metadata for object tagging/copy with metadata replacement // replicate metadata for object tagging/copy with metadata replacement
srcOpts := miniogo.CopySrcOptions{ srcOpts := minio.CopySrcOptions{
Bucket: tgt.Bucket, Bucket: tgt.Bucket,
Object: object, Object: object,
VersionID: objInfo.VersionID, VersionID: objInfo.VersionID,
} }
dstOpts := miniogo.PutObjectOptions{ dstOpts := minio.PutObjectOptions{
Internal: miniogo.AdvancedPutOptions{ Internal: minio.AdvancedPutOptions{
SourceVersionID: objInfo.VersionID, SourceVersionID: objInfo.VersionID,
ReplicationRequest: true, // always set this to distinguish between `mc mirror` replication and serverside ReplicationRequest: true, // always set this to distinguish between `mc mirror` replication and serverside
}, },
@ -1372,8 +1371,8 @@ func (ri ReplicateObjectInfo) replicateAll(ctx context.Context, objectAPI Object
return return
} }
func replicateObjectWithMultipart(ctx context.Context, c *miniogo.Core, bucket, object string, r io.Reader, objInfo ObjectInfo, opts miniogo.PutObjectOptions) (err error) { func replicateObjectWithMultipart(ctx context.Context, c *minio.Core, bucket, object string, r io.Reader, objInfo ObjectInfo, opts minio.PutObjectOptions) (err error) {
var uploadedParts []miniogo.CompletePart var uploadedParts []minio.CompletePart
uploadID, err := c.NewMultipartUpload(context.Background(), bucket, object, opts) uploadID, err := c.NewMultipartUpload(context.Background(), bucket, object, opts)
if err != nil { if err != nil {
return err return err
@ -1399,7 +1398,7 @@ func replicateObjectWithMultipart(ctx context.Context, c *miniogo.Core, bucket,
var ( var (
hr *hash.Reader hr *hash.Reader
pInfo miniogo.ObjectPart pInfo minio.ObjectPart
) )
for _, partInfo := range objInfo.Parts { for _, partInfo := range objInfo.Parts {
@ -1414,13 +1413,13 @@ func replicateObjectWithMultipart(ctx context.Context, c *miniogo.Core, bucket,
if pInfo.Size != partInfo.ActualSize { if pInfo.Size != partInfo.ActualSize {
return fmt.Errorf("Part size mismatch: got %d, want %d", pInfo.Size, partInfo.ActualSize) return fmt.Errorf("Part size mismatch: got %d, want %d", pInfo.Size, partInfo.ActualSize)
} }
uploadedParts = append(uploadedParts, miniogo.CompletePart{ uploadedParts = append(uploadedParts, minio.CompletePart{
PartNumber: pInfo.PartNumber, PartNumber: pInfo.PartNumber,
ETag: pInfo.ETag, ETag: pInfo.ETag,
}) })
} }
_, err = c.CompleteMultipartUpload(ctx, bucket, object, uploadID, uploadedParts, miniogo.PutObjectOptions{ _, err = c.CompleteMultipartUpload(ctx, bucket, object, uploadID, uploadedParts, minio.PutObjectOptions{
Internal: miniogo.AdvancedPutOptions{ Internal: minio.AdvancedPutOptions{
SourceMTime: objInfo.ModTime, SourceMTime: objInfo.ModTime,
// always set this to distinguish between `mc mirror` replication and serverside // always set this to distinguish between `mc mirror` replication and serverside
ReplicationRequest: true, ReplicationRequest: true,
@ -1874,7 +1873,7 @@ type proxyResult struct {
// get Reader from replication target if active-active replication is in place and // get Reader from replication target if active-active replication is in place and
// this node returns a 404 // this node returns a 404
func proxyGetToReplicationTarget(ctx context.Context, bucket, object string, rs *HTTPRangeSpec, h http.Header, opts ObjectOptions, proxyTargets *madmin.BucketTargets) (gr *GetObjectReader, proxy proxyResult, err error) { func proxyGetToReplicationTarget(ctx context.Context, bucket, object string, rs *HTTPRangeSpec, _ http.Header, opts ObjectOptions, proxyTargets *madmin.BucketTargets) (gr *GetObjectReader, proxy proxyResult, err error) {
tgt, oi, proxy := proxyHeadToRepTarget(ctx, bucket, object, rs, opts, proxyTargets) tgt, oi, proxy := proxyHeadToRepTarget(ctx, bucket, object, rs, opts, proxyTargets)
if !proxy.Proxy { if !proxy.Proxy {
return nil, proxy, nil return nil, proxy, nil
@ -1883,10 +1882,10 @@ func proxyGetToReplicationTarget(ctx context.Context, bucket, object string, rs
if err != nil { if err != nil {
return nil, proxy, err return nil, proxy, err
} }
gopts := miniogo.GetObjectOptions{ gopts := minio.GetObjectOptions{
VersionID: opts.VersionID, VersionID: opts.VersionID,
ServerSideEncryption: opts.ServerSideEncryption, ServerSideEncryption: opts.ServerSideEncryption,
Internal: miniogo.AdvancedGetOptions{ Internal: minio.AdvancedGetOptions{
ReplicationProxyRequest: "true", ReplicationProxyRequest: "true",
}, },
PartNumber: opts.PartNumber, PartNumber: opts.PartNumber,
@ -1903,7 +1902,7 @@ func proxyGetToReplicationTarget(ctx context.Context, bucket, object string, rs
if err = gopts.SetMatchETag(oi.ETag); err != nil { if err = gopts.SetMatchETag(oi.ETag); err != nil {
return nil, proxy, err return nil, proxy, err
} }
c := miniogo.Core{Client: tgt.Client} c := minio.Core{Client: tgt.Client}
obj, _, h, err := c.GetObject(ctx, bucket, object, gopts) obj, _, h, err := c.GetObject(ctx, bucket, object, gopts)
if err != nil { if err != nil {
return nil, proxy, err return nil, proxy, err
@ -1963,10 +1962,10 @@ func proxyHeadToRepTarget(ctx context.Context, bucket, object string, rs *HTTPRa
continue continue
} }
gopts := miniogo.GetObjectOptions{ gopts := minio.GetObjectOptions{
VersionID: opts.VersionID, VersionID: opts.VersionID,
ServerSideEncryption: opts.ServerSideEncryption, ServerSideEncryption: opts.ServerSideEncryption,
Internal: miniogo.AdvancedGetOptions{ Internal: minio.AdvancedGetOptions{
ReplicationProxyRequest: "true", ReplicationProxyRequest: "true",
}, },
PartNumber: opts.PartNumber, PartNumber: opts.PartNumber,
@ -2356,9 +2355,9 @@ func (s *replicationResyncer) resyncBucket(ctx context.Context, objectAPI Object
roi.EventType = ReplicateExisting roi.EventType = ReplicateExisting
replicateObject(ctx, roi, objectAPI) replicateObject(ctx, roi, objectAPI)
} }
_, err = tgt.StatObject(ctx, tgt.Bucket, roi.Name, miniogo.StatObjectOptions{ _, err = tgt.StatObject(ctx, tgt.Bucket, roi.Name, minio.StatObjectOptions{
VersionID: roi.VersionID, VersionID: roi.VersionID,
Internal: miniogo.AdvancedGetOptions{ Internal: minio.AdvancedGetOptions{
ReplicationProxyRequest: "false", ReplicationProxyRequest: "false",
}, },
}) })

5
cmd/bucket-targets.go
View File

@ -27,7 +27,6 @@ import (
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/minio/madmin-go" "github.com/minio/madmin-go"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
miniogo "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"github.com/minio/minio/internal/bucket/replication" "github.com/minio/minio/internal/bucket/replication"
"github.com/minio/minio/internal/crypto" "github.com/minio/minio/internal/crypto"
@ -442,7 +441,7 @@ func (sys *BucketTargetSys) getRemoteTargetClient(tcfg *madmin.BucketTarget) (*T
config := tcfg.Credentials config := tcfg.Credentials
creds := credentials.NewStaticV4(config.AccessKey, config.SecretKey, "") creds := credentials.NewStaticV4(config.AccessKey, config.SecretKey, "")
api, err := minio.New(tcfg.Endpoint, &miniogo.Options{ api, err := minio.New(tcfg.Endpoint, &minio.Options{
Creds: creds, Creds: creds,
Secure: tcfg.Secure, Secure: tcfg.Secure,
Region: tcfg.Region, Region: tcfg.Region,
@ -549,7 +548,7 @@ func parseBucketTargetConfig(bucket string, cdata, cmetadata []byte) (*madmin.Bu
// TargetClient is the struct for remote target client. // TargetClient is the struct for remote target client.
type TargetClient struct { type TargetClient struct {
*miniogo.Client *minio.Client
healthCheckDuration time.Duration healthCheckDuration time.Duration
Bucket string // remote bucket target Bucket string // remote bucket target
replicateSync bool replicateSync bool

5
cmd/data-scanner-metric.go
View File

@ -61,6 +61,7 @@ const (
scannerMetricScanFolder // Scan a folder on disk, recursively. scannerMetricScanFolder // Scan a folder on disk, recursively.
scannerMetricScanCycle // Full cycle, cluster global scannerMetricScanCycle // Full cycle, cluster global
scannerMetricScanBucketDrive // Single bucket on one drive scannerMetricScanBucketDrive // Single bucket on one drive
scannerMetricCompactFolder // Folder compacted.
// Must be last: // Must be last:
scannerMetricLast scannerMetricLast
@ -194,7 +195,7 @@ func (p *scannerMetrics) activeDrives() int {
// lifetime returns the lifetime count of the specified metric. // lifetime returns the lifetime count of the specified metric.
func (p *scannerMetrics) lifetime(m scannerMetric) uint64 { func (p *scannerMetrics) lifetime(m scannerMetric) uint64 {
if m < 0 || m >= scannerMetricLast { if m >= scannerMetricLast {
return 0 return 0
} }
val := atomic.LoadUint64(&p.operations[m]) val := atomic.LoadUint64(&p.operations[m])
@ -204,7 +205,7 @@ func (p *scannerMetrics) lifetime(m scannerMetric) uint64 {
// lastMinute returns the last minute statistics of a metric. // lastMinute returns the last minute statistics of a metric.
// m should be < scannerMetricLastRealtime // m should be < scannerMetricLastRealtime
func (p *scannerMetrics) lastMinute(m scannerMetric) AccElem { func (p *scannerMetrics) lastMinute(m scannerMetric) AccElem {
if m < 0 || m >= scannerMetricLastRealtime { if m >= scannerMetricLastRealtime {
return AccElem{} return AccElem{}
} }
val := p.latency[m].total() val := p.latency[m].total()

14
cmd/data-scanner.go
View File

@ -813,9 +813,8 @@ func (f *folderScanner) scanFolder(ctx context.Context, folder cachedFolder, int
flat.Compacted = true flat.Compacted = true
var compact bool var compact bool
if flat.Objects < dataScannerCompactLeastObject { if flat.Objects < dataScannerCompactLeastObject {
if f.dataUsageScannerDebug && flat.Objects > 1 { if flat.Objects > 1 {
// Disabled, rather chatty: globalScannerMetrics.log(scannerMetricCompactFolder, folder.name)
// console.Debugf(scannerLogPrefix+" Only %d objects, compacting %s -> %+v\n", flat.Objects, folder.name, flat)
} }
compact = true compact = true
} else { } else {
@ -829,9 +828,8 @@ func (f *folderScanner) scanFolder(ctx context.Context, folder cachedFolder, int
} }
} }
} }
if f.dataUsageScannerDebug && compact { if compact {
// Disabled, rather chatty: globalScannerMetrics.log(scannerMetricCompactFolder, folder.name)
// console.Debugf(scannerLogPrefix+" Only objects (%d), compacting %s -> %+v\n", flat.Objects, folder.name, flat)
} }
} }
if compact { if compact {
@ -945,10 +943,6 @@ func (i *scannerItem) applyLifecycle(ctx context.Context, o ObjectLayer, oi Obje
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
} }
if i.lifeCycle == nil { if i.lifeCycle == nil {
if i.debug {
// disabled, very chatty:
// console.Debugf(applyActionsLogPrefix+" no lifecycle rules to apply: %q\n", i.objectPath())
}
return false, size return false, size
} }

2
cmd/endpoint-ellipses.go
View File

@ -207,7 +207,7 @@ func getSetIndexes(args []string, totalSizes []uint64, customSetDriveCount uint6
} }
// Returns all the expanded endpoints, each argument is expanded separately. // Returns all the expanded endpoints, each argument is expanded separately.
func (s endpointSet) getEndpoints() (endpoints []string) { func (s *endpointSet) getEndpoints() (endpoints []string) {
if len(s.endpoints) != 0 { if len(s.endpoints) != 0 {
return s.endpoints return s.endpoints
} }

5
cmd/erasure-object.go
View File

@ -636,10 +636,7 @@ func (er erasureObjects) getObjectFileInfo(ctx context.Context, bucket, object s
if reducedErr := reduceReadQuorumErrs(ctx, errs, objectOpIgnoredErrs, readQuorum); reducedErr != nil { if reducedErr := reduceReadQuorumErrs(ctx, errs, objectOpIgnoredErrs, readQuorum); reducedErr != nil {
if errors.Is(reducedErr, errErasureReadQuorum) && !strings.HasPrefix(bucket, minioMetaBucket) { if errors.Is(reducedErr, errErasureReadQuorum) && !strings.HasPrefix(bucket, minioMetaBucket) {
_, derr := er.deleteIfDangling(ctx, bucket, object, metaArr, errs, nil, opts) er.deleteIfDangling(ctx, bucket, object, metaArr, errs, nil, opts)
if derr != nil {
err = derr
}
} }
return fi, nil, nil, toObjectErr(reducedErr, bucket, object) return fi, nil, nil, toObjectErr(reducedErr, bucket, object)
} }

1
cmd/erasure-server-pool-rebalance.go
View File

@ -811,7 +811,6 @@ func (z *erasureServerPools) StartRebalance() {
stopfn(err) stopfn(err)
}(poolIdx) }(poolIdx)
} }
return
} }
// StopRebalance signals the rebalance goroutine running on this node (if any) // StopRebalance signals the rebalance goroutine running on this node (if any)

4
cmd/erasure-server-pool.go
View File

@ -2191,9 +2191,7 @@ func (z *erasureServerPools) ReadHealth(ctx context.Context) bool {
b := z.BackendInfo() b := z.BackendInfo()
poolReadQuorums := make([]int, len(b.StandardSCData)) poolReadQuorums := make([]int, len(b.StandardSCData))
for i, data := range b.StandardSCData { copy(poolReadQuorums, b.StandardSCData)
poolReadQuorums[i] = data
}
for poolIdx := range erasureSetUpCount { for poolIdx := range erasureSetUpCount {
for setIdx := range erasureSetUpCount[poolIdx] { for setIdx := range erasureSetUpCount[poolIdx] {

3
cmd/lock-rest-client.go
View File

@ -24,7 +24,6 @@ import (
"net/url" "net/url"
"github.com/minio/minio/internal/dsync" "github.com/minio/minio/internal/dsync"
"github.com/minio/minio/internal/http"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
"github.com/minio/minio/internal/rest" "github.com/minio/minio/internal/rest"
) )
@ -95,7 +94,7 @@ func (client *lockRESTClient) restCall(ctx context.Context, call string, args ds
defer metaDataPoolPut(argsBytes) defer metaDataPoolPut(argsBytes)
body := bytes.NewReader(argsBytes) body := bytes.NewReader(argsBytes)
respBody, err := client.callWithContext(ctx, call, nil, body, body.Size()) respBody, err := client.callWithContext(ctx, call, nil, body, body.Size())
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
switch err { switch err {
case nil: case nil:
return true, nil return true, nil

2
cmd/metacache-marker.go
View File

@ -49,7 +49,7 @@ func (o *listPathOptions) parseMarker() {
switch kv[0] { switch kv[0] {
case "minio_cache": case "minio_cache":
if kv[1] != markerTagVersion { if kv[1] != markerTagVersion {
break continue
} }
case "id": case "id":
o.ID = kv[1] o.ID = kv[1]

99
cmd/peer-rest-client.go
View File

@ -31,7 +31,6 @@ import (
"github.com/minio/madmin-go" "github.com/minio/madmin-go"
"github.com/minio/minio/internal/event" "github.com/minio/minio/internal/event"
"github.com/minio/minio/internal/http"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
"github.com/minio/minio/internal/logger/message/log" "github.com/minio/minio/internal/logger/message/log"
@ -92,7 +91,7 @@ func (client *peerRESTClient) GetLocks() (lockMap map[string][]lockRequesterInfo
return return
} }
lockMap = map[string][]lockRequesterInfo{} lockMap = map[string][]lockRequesterInfo{}
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&lockMap) err = gob.NewDecoder(respBody).Decode(&lockMap)
return lockMap, err return lockMap, err
} }
@ -103,7 +102,7 @@ func (client *peerRESTClient) LocalStorageInfo() (info StorageInfo, err error) {
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -114,7 +113,7 @@ func (client *peerRESTClient) ServerInfo() (info madmin.ServerProperties, err er
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -125,7 +124,7 @@ func (client *peerRESTClient) GetCPUs(ctx context.Context) (info madmin.CPUs, er
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -136,7 +135,7 @@ func (client *peerRESTClient) GetPartitions(ctx context.Context) (info madmin.Pa
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -147,7 +146,7 @@ func (client *peerRESTClient) GetOSInfo(ctx context.Context) (info madmin.OSInfo
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -158,7 +157,7 @@ func (client *peerRESTClient) GetSELinuxInfo(ctx context.Context) (info madmin.S
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -171,7 +170,7 @@ func (client *peerRESTClient) GetSysConfig(ctx context.Context) (info madmin.Sys
return return
} }
roundtrip := int32(time.Since(sent).Milliseconds()) roundtrip := int32(time.Since(sent).Milliseconds())
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
cfg := info.Config["time-info"] cfg := info.Config["time-info"]
@ -189,7 +188,7 @@ func (client *peerRESTClient) GetSysErrors(ctx context.Context) (info madmin.Sys
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -200,7 +199,7 @@ func (client *peerRESTClient) GetMemInfo(ctx context.Context) (info madmin.MemIn
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -219,7 +218,7 @@ func (client *peerRESTClient) GetMetrics(ctx context.Context, t madmin.MetricTyp
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -230,7 +229,7 @@ func (client *peerRESTClient) GetProcInfo(ctx context.Context) (info madmin.Proc
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&info) err = gob.NewDecoder(respBody).Decode(&info)
return info, err return info, err
} }
@ -243,7 +242,7 @@ func (client *peerRESTClient) StartProfiling(profiler string) error {
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -253,7 +252,7 @@ func (client *peerRESTClient) DownloadProfileData() (data map[string][]byte, err
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&data) err = gob.NewDecoder(respBody).Decode(&data)
return data, err return data, err
} }
@ -268,7 +267,7 @@ func (client *peerRESTClient) GetBucketStats(bucket string) (BucketStats, error)
} }
var bs BucketStats var bs BucketStats
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return bs, msgp.Decode(respBody, &bs) return bs, msgp.Decode(respBody, &bs)
} }
@ -281,7 +280,7 @@ func (client *peerRESTClient) GetAllBucketStats() (BucketStatsMap, error) {
} }
bsMap := BucketStatsMap{} bsMap := BucketStatsMap{}
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return bsMap, msgp.Decode(respBody, &bsMap) return bsMap, msgp.Decode(respBody, &bsMap)
} }
@ -293,7 +292,7 @@ func (client *peerRESTClient) LoadBucketMetadata(bucket string) error {
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -305,7 +304,7 @@ func (client *peerRESTClient) DeleteBucketMetadata(bucket string) error {
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -324,7 +323,7 @@ func (client *peerRESTClient) cycleServerBloomFilter(ctx context.Context, req bl
return nil, err return nil, err
} }
var resp bloomFilterResponse var resp bloomFilterResponse
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return &resp, gob.NewDecoder(respBody).Decode(&resp) return &resp, gob.NewDecoder(respBody).Decode(&resp)
} }
@ -337,7 +336,7 @@ func (client *peerRESTClient) DeletePolicy(policyName string) (err error) {
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -350,7 +349,7 @@ func (client *peerRESTClient) LoadPolicy(policyName string) (err error) {
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -367,7 +366,7 @@ func (client *peerRESTClient) LoadPolicyMapping(userOrGroup string, userType IAM
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -380,7 +379,7 @@ func (client *peerRESTClient) DeleteUser(accessKey string) (err error) {
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -393,7 +392,7 @@ func (client *peerRESTClient) DeleteServiceAccount(accessKey string) (err error)
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -407,7 +406,7 @@ func (client *peerRESTClient) LoadUser(accessKey string, temp bool) (err error)
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -420,7 +419,7 @@ func (client *peerRESTClient) LoadServiceAccount(accessKey string) (err error) {
if err != nil { if err != nil {
return return
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -432,7 +431,7 @@ func (client *peerRESTClient) LoadGroup(group string) error {
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -459,7 +458,7 @@ func (client *peerRESTClient) VerifyBinary(ctx context.Context, u *url.URL, sha2
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -469,7 +468,7 @@ func (client *peerRESTClient) CommitBinary(ctx context.Context) error {
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -482,7 +481,7 @@ func (client *peerRESTClient) SignalService(sig serviceSignal, subSys string) er
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -491,7 +490,7 @@ func (client *peerRESTClient) BackgroundHealStatus() (madmin.BgHealState, error)
if err != nil { if err != nil {
return madmin.BgHealState{}, err return madmin.BgHealState{}, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
state := madmin.BgHealState{} state := madmin.BgHealState{}
err = gob.NewDecoder(respBody).Decode(&state) err = gob.NewDecoder(respBody).Decode(&state)
@ -505,7 +504,7 @@ func (client *peerRESTClient) GetLocalDiskIDs(ctx context.Context) (diskIDs []st
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return nil return nil
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
if err = gob.NewDecoder(respBody).Decode(&diskIDs); err != nil { if err = gob.NewDecoder(respBody).Decode(&diskIDs); err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return nil return nil
@ -531,7 +530,7 @@ func (client *peerRESTClient) GetMetacacheListing(ctx context.Context, o listPat
return nil, err return nil, err
} }
var resp metacache var resp metacache
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return &resp, msgp.Decode(respBody, &resp) return &resp, msgp.Decode(respBody, &resp)
} }
@ -549,7 +548,7 @@ func (client *peerRESTClient) UpdateMetacacheListing(ctx context.Context, m meta
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return m, err return m, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
var resp metacache var resp metacache
return resp, msgp.Decode(respBody, &resp) return resp, msgp.Decode(respBody, &resp)
} }
@ -560,7 +559,7 @@ func (client *peerRESTClient) ReloadPoolMeta(ctx context.Context) error {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -570,7 +569,7 @@ func (client *peerRESTClient) StopRebalance(ctx context.Context) error {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -582,7 +581,7 @@ func (client *peerRESTClient) LoadRebalanceMeta(ctx context.Context, startRebala
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -592,7 +591,7 @@ func (client *peerRESTClient) LoadTransitionTierConfig(ctx context.Context) erro
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -615,7 +614,7 @@ func (client *peerRESTClient) doTrace(traceCh chan<- madmin.TraceInfo, doneCh <-
}() }()
respBody, err := client.callWithContext(ctx, peerRESTMethodTrace, values, nil, -1) respBody, err := client.callWithContext(ctx, peerRESTMethodTrace, values, nil, -1)
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
if err != nil { if err != nil {
return return
@ -653,7 +652,7 @@ func (client *peerRESTClient) doListen(listenCh chan<- event.Event, doneCh <-cha
}() }()
respBody, err := client.callWithContext(ctx, peerRESTMethodListen, v, nil, -1) respBody, err := client.callWithContext(ctx, peerRESTMethodListen, v, nil, -1)
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
if err != nil { if err != nil {
return return
@ -723,7 +722,7 @@ func (client *peerRESTClient) doConsoleLog(logCh chan log.Info, doneCh <-chan st
}() }()
respBody, err := client.callWithContext(ctx, peerRESTMethodLog, nil, nil, -1) respBody, err := client.callWithContext(ctx, peerRESTMethodLog, nil, nil, -1)
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
if err != nil { if err != nil {
return return
} }
@ -822,7 +821,7 @@ func (client *peerRESTClient) MonitorBandwidth(ctx context.Context, buckets []st
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
dec := gob.NewDecoder(respBody) dec := gob.NewDecoder(respBody)
var bandwidthReport madmin.BucketBandwidthReport var bandwidthReport madmin.BucketBandwidthReport
@ -841,7 +840,7 @@ func (client *peerRESTClient) GetPeerMetrics(ctx context.Context) (<-chan Metric
for { for {
var metric Metric var metric Metric
if err := dec.Decode(&metric); err != nil { if err := dec.Decode(&metric); err != nil {
http.DrainBody(respBody) xhttp.DrainBody(respBody)
close(ch) close(ch)
return return
} }
@ -863,7 +862,7 @@ func (client *peerRESTClient) SpeedTest(ctx context.Context, opts speedTestOpts)
if err != nil { if err != nil {
return SpeedTestResult{}, err return SpeedTestResult{}, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
waitReader, err := waitForHTTPResponse(respBody) waitReader, err := waitForHTTPResponse(respBody)
if err != nil { if err != nil {
return SpeedTestResult{}, err return SpeedTestResult{}, err
@ -892,7 +891,7 @@ func (client *peerRESTClient) DriveSpeedTest(ctx context.Context, opts madmin.Dr
if err != nil { if err != nil {
return madmin.DriveSpeedTestResult{}, err return madmin.DriveSpeedTestResult{}, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
waitReader, err := waitForHTTPResponse(respBody) waitReader, err := waitForHTTPResponse(respBody)
if err != nil { if err != nil {
return madmin.DriveSpeedTestResult{}, err return madmin.DriveSpeedTestResult{}, err
@ -914,7 +913,7 @@ func (client *peerRESTClient) ReloadSiteReplicationConfig(ctx context.Context) e
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return nil return nil
} }
@ -924,7 +923,7 @@ func (client *peerRESTClient) GetLastDayTierStats(ctx context.Context) (DailyAll
if err != nil { if err != nil {
return result, err return result, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&result) err = gob.NewDecoder(respBody).Decode(&result)
if err != nil { if err != nil {
@ -939,7 +938,7 @@ func (client *peerRESTClient) DevNull(ctx context.Context, r io.Reader) error {
if err != nil { if err != nil {
return err return err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
return err return err
} }
@ -952,7 +951,7 @@ func (client *peerRESTClient) Netperf(ctx context.Context, duration time.Duratio
if err != nil { if err != nil {
return result, err return result, err
} }
defer http.DrainBody(respBody) defer xhttp.DrainBody(respBody)
err = gob.NewDecoder(respBody).Decode(&result) err = gob.NewDecoder(respBody).Decode(&result)
return result, err return result, err
} }

7
cmd/scannermetric_string.go
View File

@ -26,12 +26,13 @@ func _() {
_ = x[scannerMetricScanFolder-15] _ = x[scannerMetricScanFolder-15]
_ = x[scannerMetricScanCycle-16] _ = x[scannerMetricScanCycle-16]
_ = x[scannerMetricScanBucketDrive-17] _ = x[scannerMetricScanBucketDrive-17]
_ = x[scannerMetricLast-18] _ = x[scannerMetricCompactFolder-18]
_ = x[scannerMetricLast-19]
} }
const _scannerMetric_name = "ReadMetadataCheckMissingSaveUsageApplyAllApplyVersionTierObjSweepHealCheckILMCheckReplicationYieldCleanAbandonedApplyNonCurrentStartTraceScanObjectLastRealtimeScanFolderScanCycleScanBucketDriveLast" const _scannerMetric_name = "ReadMetadataCheckMissingSaveUsageApplyAllApplyVersionTierObjSweepHealCheckILMCheckReplicationYieldCleanAbandonedApplyNonCurrentStartTraceScanObjectLastRealtimeScanFolderScanCycleScanBucketDriveCompactFolderLast"
var _scannerMetric_index = [...]uint8{0, 12, 24, 33, 41, 53, 65, 74, 77, 93, 98, 112, 127, 137, 147, 159, 169, 178, 193, 197} var _scannerMetric_index = [...]uint8{0, 12, 24, 33, 41, 53, 65, 74, 77, 93, 98, 112, 127, 137, 147, 159, 169, 178, 193, 206, 210}
func (i scannerMetric) String() string { func (i scannerMetric) String() string {
if i >= scannerMetric(len(_scannerMetric_index)-1) { if i >= scannerMetric(len(_scannerMetric_index)-1) {

9
cmd/shared-lock.go
View File

@ -40,6 +40,7 @@ func (ld sharedLock) backgroundRoutine(ctx context.Context, objAPI ObjectLayer,
continue continue
} }
keepLock:
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -48,7 +49,7 @@ func (ld sharedLock) backgroundRoutine(ctx context.Context, objAPI ObjectLayer,
// The context of the lock is canceled, this can happen // The context of the lock is canceled, this can happen
// if one lock lost quorum due to cluster instability // if one lock lost quorum due to cluster instability
// in that case, try to lock again. // in that case, try to lock again.
break break keepLock
case ld.lockContext <- lkctx: case ld.lockContext <- lkctx:
// Send the lock context to anyone asking for it // Send the lock context to anyone asking for it
} }
@ -70,10 +71,8 @@ func mergeContext(ctx1, ctx2 context.Context) (context.Context, context.CancelFu
} }
func (ld sharedLock) GetLock(ctx context.Context) (context.Context, context.CancelFunc) { func (ld sharedLock) GetLock(ctx context.Context) (context.Context, context.CancelFunc) {
select { l := <-ld.lockContext
case l := <-ld.lockContext: return mergeContext(l.Context(), ctx)
return mergeContext(l.Context(), ctx)
}
} }
func newSharedLock(ctx context.Context, objAPI ObjectLayer, lockName string) *sharedLock { func newSharedLock(ctx context.Context, objAPI ObjectLayer, lockName string) *sharedLock {

3
cmd/site-replication.go
View File

@ -42,7 +42,6 @@ import (
"github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/auth"
sreplication "github.com/minio/minio/internal/bucket/replication" sreplication "github.com/minio/minio/internal/bucket/replication"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
"github.com/minio/pkg/bucket/policy"
bktpolicy "github.com/minio/pkg/bucket/policy" bktpolicy "github.com/minio/pkg/bucket/policy"
iampolicy "github.com/minio/pkg/iam/policy" iampolicy "github.com/minio/pkg/iam/policy"
) )
@ -1355,7 +1354,7 @@ func (c *SiteReplicationSys) PeerBucketVersioningHandler(ctx context.Context, bu
} }
// PeerBucketPolicyHandler - copies/deletes policy to local cluster. // PeerBucketPolicyHandler - copies/deletes policy to local cluster.
func (c *SiteReplicationSys) PeerBucketPolicyHandler(ctx context.Context, bucket string, policy *policy.Policy, updatedAt time.Time) error { func (c *SiteReplicationSys) PeerBucketPolicyHandler(ctx context.Context, bucket string, policy *bktpolicy.Policy, updatedAt time.Time) error {
// skip overwrite if local update is newer than peer update. // skip overwrite if local update is newer than peer update.
if !updatedAt.IsZero() { if !updatedAt.IsZero() {
if _, updateTm, err := globalBucketMetadataSys.GetPolicyConfig(bucket); err == nil && updateTm.After(updatedAt) { if _, updateTm, err := globalBucketMetadataSys.GetPolicyConfig(bucket); err == nil && updateTm.After(updatedAt) {

2
cmd/streaming-signature-v4.go
View File

@ -320,7 +320,7 @@ func (cr *s3ChunkedReader) Read(buf []byte) (n int, err error) {
return n, cr.err return n, cr.err
} }
b, err = cr.reader.ReadByte() b, err = cr.reader.ReadByte()
if b != '\r' { if b != '\r' || err != nil {
cr.err = errMalformedEncoding cr.err = errMalformedEncoding
return n, cr.err return n, cr.err
} }

1
cmd/untar.go
View File

@ -241,6 +241,7 @@ func untar(ctx context.Context, r io.Reader, putObject func(reader io.Reader, in
rc.Close() rc.Close()
<-asyncWriters <-asyncWriters
wg.Done() wg.Done()
//lint:ignore SA6002 we are fine with the tiny alloc
poolBuf128k.Put(b) poolBuf128k.Put(b)
}() }()
if err := putObject(&rc, fi, name); err != nil { if err := putObject(&rc, fi, name); err != nil {

5
cmd/warm-backend-s3.go
View File

@ -28,8 +28,7 @@ import (
"time" "time"
"github.com/minio/madmin-go" "github.com/minio/madmin-go"
minio "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
miniogo "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
) )
@ -80,7 +79,7 @@ func (s3 *warmBackendS3) Get(ctx context.Context, object string, rv remoteVersio
return nil, s3.ToObjectError(err, object) return nil, s3.ToObjectError(err, object)
} }
} }
c := &miniogo.Core{Client: s3.client} c := &minio.Core{Client: s3.client}
// Important to use core primitives here to pass range get options as is. // Important to use core primitives here to pass range get options as is.
r, _, _, err := c.GetObject(ctx, s3.Bucket, s3.getDest(object), gopts) r, _, _, err := c.GetObject(ctx, s3.Bucket, s3.getDest(object), gopts)
if err != nil { if err != nil {

4
cmd/xl-storage-format-v2.go
View File

@ -678,6 +678,7 @@ func metaDataPoolGet() []byte {
// metaDataPoolPut will put an unused small buffer back into the pool. // metaDataPoolPut will put an unused small buffer back into the pool.
func metaDataPoolPut(buf []byte) { func metaDataPoolPut(buf []byte) {
if cap(buf) >= metaDataReadDefault && cap(buf) < metaDataReadDefault*4 { if cap(buf) >= metaDataReadDefault && cap(buf) < metaDataReadDefault*4 {
//lint:ignore SA6002 we are fine with the tiny alloc
metaDataPool.Put(buf) metaDataPool.Put(buf)
} }
} }
@ -1845,11 +1846,9 @@ func mergeXLV2Versions(quorum int, strict bool, requestedVersions int, versions
} }
var latest xlMetaV2ShallowVersion var latest xlMetaV2ShallowVersion
var latestCount int
if consistent { if consistent {
// All had the same signature, easy. // All had the same signature, easy.
latest = tops[0] latest = tops[0]
latestCount = len(tops)
merged = append(merged, latest) merged = append(merged, latest)
// Calculate latest 'n' non-free versions. // Calculate latest 'n' non-free versions.
@ -1859,6 +1858,7 @@ func mergeXLV2Versions(quorum int, strict bool, requestedVersions int, versions
} else { } else {
// Find latest. // Find latest.
var latestCount int
for i, ver := range tops { for i, ver := range tops {
if ver.header == latest.header { if ver.header == latest.header {
latestCount++ latestCount++

2
internal/config/identity/plugin/config.go
View File

@ -264,7 +264,7 @@ func (o *AuthNPlugin) Authenticate(roleArn arn.ARN, token string) (AuthNResponse
return AuthNResponse{}, fmt.Errorf("Invalid role ARN value: %s", roleArn.String()) return AuthNResponse{}, fmt.Errorf("Invalid role ARN value: %s", roleArn.String())
} }
var u url.URL = url.URL(*o.args.URL) u := url.URL(*o.args.URL)
q := u.Query() q := u.Query()
q.Set("token", token) q.Set("token", token)
u.RawQuery = q.Encode() u.RawQuery = q.Encode()

52
internal/kms/kes.go
View File

@ -103,35 +103,33 @@ func NewWithConfig(config Config) (KMS, error) {
go func() { go func() {
for { for {
var prevCertificate tls.Certificate var prevCertificate tls.Certificate
select { certificate, ok := <-config.ReloadCertEvents
case certificate, ok := <-config.ReloadCertEvents: if !ok {
if !ok { return
return }
} sameCert := len(certificate.Certificate) == len(prevCertificate.Certificate)
sameCert := len(certificate.Certificate) == len(prevCertificate.Certificate) for i, b := range certificate.Certificate {
for i, b := range certificate.Certificate {
if !sameCert {
break
}
sameCert = sameCert && bytes.Equal(b, prevCertificate.Certificate[i])
}
// Do not reload if its the same cert as before.
if !sameCert { if !sameCert {
client := kes.NewClientWithConfig("", &tls.Config{ break
MinVersion: tls.VersionTLS12,
Certificates: []tls.Certificate{certificate},
RootCAs: config.RootCAs,
ClientSessionCache: tls.NewLRUClientSessionCache(tlsClientSessionCacheSize),
})
client.Endpoints = endpoints
c.lock.Lock()
c.client = client
c.enclave = c.client.Enclave(config.Enclave)
c.lock.Unlock()
prevCertificate = certificate
} }
sameCert = sameCert && bytes.Equal(b, prevCertificate.Certificate[i])
}
// Do not reload if its the same cert as before.
if !sameCert {
client := kes.NewClientWithConfig("", &tls.Config{
MinVersion: tls.VersionTLS12,
Certificates: []tls.Certificate{certificate},
RootCAs: config.RootCAs,
ClientSessionCache: tls.NewLRUClientSessionCache(tlsClientSessionCacheSize),
})
client.Endpoints = endpoints
c.lock.Lock()
c.client = client
c.enclave = c.client.Enclave(config.Enclave)
c.lock.Unlock()
prevCertificate = certificate
} }
} }
}() }()