From 27e07e80bcff86e998b1c5451091141fcb9eddf4 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Sat, 17 Jul 2021 01:17:35 -0700 Subject: [PATCH] fix: accountInfo() error FS mode (#12734) --- .github/workflows/go-lint.yml | 3 ++- cmd/data-usage.go | 4 ++-- go.mod | 1 - go.sum | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml index 1fbc80f0c..15d60f6b7 100644 --- a/.github/workflows/go-lint.yml +++ b/.github/workflows/go-lint.yml @@ -32,10 +32,11 @@ jobs: CGO_ENABLED: 0 GO111MODULE: on run: | + sudo apt install jq -y sudo sysctl net.ipv6.conf.all.disable_ipv6=0 sudo sysctl net.ipv6.conf.default.disable_ipv6=0 nancy_version=$(curl --retry 10 -Ls -o /dev/null -w "%{url_effective}" https://github.com/sonatype-nexus-community/nancy/releases/latest | sed "s/https:\/\/github.com\/sonatype-nexus-community\/nancy\/releases\/tag\///") curl -L -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/${nancy_version}/nancy-${nancy_version}-linux-amd64 && chmod +x nancy - go list -m all | ./nancy sleuth + go list -deps -json ./... | jq -s 'unique_by(.Module.Path)|.[]|select(has("Module"))|.Module' | ./nancy sleuth make make test-race diff --git a/cmd/data-usage.go b/cmd/data-usage.go index 8678854f3..6776919dc 100644 --- a/cmd/data-usage.go +++ b/cmd/data-usage.go @@ -20,7 +20,6 @@ package cmd import ( "bytes" "context" - "errors" "net/http" "strings" @@ -66,7 +65,8 @@ func storeDataUsageInBackend(ctx context.Context, objAPI ObjectLayer, dui <-chan func loadPrefixUsageFromBackend(ctx context.Context, objAPI ObjectLayer, bucket string) (map[string]uint64, error) { z, ok := objAPI.(*erasureServerPools) if !ok { - return nil, errors.New("prefix usage is not supported") + // Prefix usage is empty + return map[string]uint64{}, nil } cache := dataUsageCache{} diff --git a/go.mod b/go.mod index c3c3b4648..19da388a1 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,6 @@ require ( github.com/secure-io/sio-go v0.3.1 github.com/streadway/amqp v1.0.0 github.com/tinylib/msgp v1.1.6-0.20210521143832-0becd170c402 - github.com/ulikunitz/xz v0.5.10 // indirect github.com/valyala/bytebufferpool v1.0.0 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c diff --git a/go.sum b/go.sum index 97a5656a5..7e5ece656 100644 --- a/go.sum +++ b/go.sum @@ -1410,8 +1410,6 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= -github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/unrolled/secure v1.0.7 h1:BcQHp3iKZyZCKj5gRqwQG+5urnGBF00wGgoPPwtheVQ=