JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/accounting: bugfix infinit storage usage increase (#3916)

Browse Source 
* satellite/accounting: bugfix infinit storage usage increase

* support int64 values

Co-authored-by: JT Olio <hello@jtolio.com>
This commit is contained in:
littleskunk 2020-07-03 20:34:13 +02:00 committed by GitHub
parent c40d5043e1
commit e1a18ce974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
satellite/accounting/live/redis.go
View File

@ -7,6 +7,7 @@ import (
"context"
"fmt"
"strconv"
"strings"
"time"
"go.uber.org/zap"
@ -44,8 +45,8 @@ func (cache *redisLiveAccounting) GetProjectStorageUsage(ctx context.Context, pr
}
return 0, Error.Wrap(err)
}
intval, err := strconv.Atoi(string(val))
return int64(intval), Error.Wrap(err)
intval, err := strconv.ParseInt(string([]byte(val)), 10, 64)
return intval, Error.Wrap(err)
}
// createBandwidthProjectIDKey creates the bandwidth project key.
@ -65,8 +66,8 @@ func (cache *redisLiveAccounting) GetProjectBandwidthUsage(ctx context.Context,
if err != nil {
return 0, err
}
intval, err := strconv.Atoi(string(val))
return int64(intval), Error.Wrap(err)
intval, err := strconv.ParseInt(string([]byte(val)), 10, 64)
return intval, Error.Wrap(err)
}
// UpdateProjectBandwidthUsage increment the bandwidth cache key value.
@ -115,11 +116,13 @@ func (cache *redisLiveAccounting) GetAllProjectTotals(ctx context.Context) (_ ma
}
id := new(uuid.UUID)
copy(id[:], item.Key[:])
intval, err := strconv.Atoi(string(item.Value))
intval, err := strconv.ParseInt(string([]byte(item.Value)), 10, 64)
if err != nil {
return Error.New("could not get total for project %s", id.String())
}
projects[*id] = int64(intval)
if !strings.HasSuffix(item.Key.String(), "bandwidth") {
projects[*id] = intval
}
}
return nil
})