forked from TrueCloudLab/frostfs-node
[#1377] oid, cid: Upgrade SDK package
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
f65898a354
commit
f15e6e888f
118 changed files with 1455 additions and 886 deletions
|
@ -32,8 +32,6 @@ type singleResultCtx struct {
|
|||
|
||||
log *logger.Logger
|
||||
|
||||
cid *cid.ID
|
||||
|
||||
txTable *common.TransferTable
|
||||
|
||||
cnrInfo common.ContainerInfo
|
||||
|
@ -146,9 +144,15 @@ func (c *Calculator) processResult(ctx *singleResultCtx) {
|
|||
}
|
||||
|
||||
func (c *Calculator) readContainerInfo(ctx *singleResultCtx) bool {
|
||||
cnr, ok := ctx.auditResult.Container()
|
||||
if !ok {
|
||||
ctx.log.Error("missing container in audit result")
|
||||
return false
|
||||
}
|
||||
|
||||
var err error
|
||||
|
||||
ctx.cnrInfo, err = c.prm.ContainerStorage.ContainerInfo(ctx.auditResult.Container())
|
||||
ctx.cnrInfo, err = c.prm.ContainerStorage.ContainerInfo(&cnr)
|
||||
if err != nil {
|
||||
ctx.log.Error("could not get container info",
|
||||
zap.String("error", err.Error()),
|
||||
|
@ -214,10 +218,10 @@ func (c *Calculator) sumSGSizes(ctx *singleResultCtx) bool {
|
|||
fail := false
|
||||
|
||||
addr := addressSDK.NewAddress()
|
||||
addr.SetContainerID(ctx.containerID())
|
||||
addr.SetContainerID(*ctx.containerID())
|
||||
|
||||
ctx.auditResult.IteratePassedStorageGroups(func(id oid.ID) bool {
|
||||
addr.SetObjectID(&id)
|
||||
addr.SetObjectID(id)
|
||||
|
||||
sgInfo, err := c.prm.SGStorage.SGInfo(addr)
|
||||
if err != nil {
|
||||
|
@ -307,11 +311,8 @@ func (c *Calculator) fillTransferTable(ctx *singleResultCtx) bool {
|
|||
}
|
||||
|
||||
func (c *singleResultCtx) containerID() *cid.ID {
|
||||
if c.cid == nil {
|
||||
c.cid = c.auditResult.Container()
|
||||
}
|
||||
|
||||
return c.cid
|
||||
cnr, _ := c.auditResult.Container()
|
||||
return &cnr
|
||||
}
|
||||
|
||||
func (c *singleResultCtx) auditEpoch() uint64 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue