container/ape: Ignore an error when getting a role #1454
1 changed files with 9 additions and 12 deletions
|
@ -537,10 +537,7 @@ func (ac *apeChecker) isContainerKey(pk []byte, cnrID cid.ID, cont *containercor
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
in, err := isContainerNode(nm, pk, binCnrID, cont)
|
if isContainerNode(nm, pk, binCnrID, cont) {
|
||||||
if err != nil {
|
|
||||||
return false, err
|
|
||||||
} else if in {
|
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -551,24 +548,24 @@ func (ac *apeChecker) isContainerKey(pk []byte, cnrID cid.ID, cont *containercor
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return isContainerNode(nm, pk, binCnrID, cont)
|
return isContainerNode(nm, pk, binCnrID, cont), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isContainerNode(nm *netmapSDK.NetMap, pk, binCnrID []byte, cont *containercore.Container) (bool, error) {
|
func isContainerNode(nm *netmapSDK.NetMap, pk, binCnrID []byte, cont *containercore.Container) bool {
|
||||||
cnrVectors, err := nm.ContainerNodes(cont.Value.PlacementPolicy(), binCnrID)
|
// It could an error only if the network map doesn't have enough nodes to
|
||||||
if err != nil {
|
// fulfil the policy. It's a logical error that doesn't affect an actor role
|
||||||
return false, err
|
// determining, so we ignore it
|
||||||
}
|
cnrVectors, _ := nm.ContainerNodes(cont.Value.PlacementPolicy(), binCnrID)
|
||||||
|
|
||||||
for i := range cnrVectors {
|
for i := range cnrVectors {
|
||||||
for j := range cnrVectors[i] {
|
for j := range cnrVectors[i] {
|
||||||
if bytes.Equal(cnrVectors[i][j].PublicKey(), pk) {
|
if bytes.Equal(cnrVectors[i][j].PublicKey(), pk) {
|
||||||
return true, nil
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false, nil
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ac *apeChecker) namespaceByOwner(owner *refs.OwnerID) (string, error) {
|
func (ac *apeChecker) namespaceByOwner(owner *refs.OwnerID) (string, error) {
|
||||||
|
|
Loading…
Reference in a new issue