achuprov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1506] ape_manager: Await tx persist before returning response

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-12-20 15:01:44 +03:00 committed by Evgenii Stratonikov
parent 198aaebc94
commit f7e75b13b0
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/frostfs-node/apemanager.go
View file

@ -19,6 +19,7 @@ func initAPEManagerService(c *cfg) {
c.cfgObject.cfgAccessPolicyEngine.policyContractHash) c.cfgObject.cfgAccessPolicyEngine.policyContractHash)
execsvc := apemanager.New(c.cfgObject.cnrSource, contractStorage, execsvc := apemanager.New(c.cfgObject.cnrSource, contractStorage,
c.cfgMorph.client,
apemanager.WithLogger(c.log)) apemanager.WithLogger(c.log))
sigsvc := apemanager.NewSignService(&c.key.PrivateKey, execsvc) sigsvc := apemanager.NewSignService(&c.key.PrivateKey, execsvc)
auditSvc := apemanager.NewAuditService(sigsvc, c.log, c.audit) auditSvc := apemanager.NewAuditService(sigsvc, c.log, c.audit)

27
pkg/services/apemanager/executor.go
View file

@ -22,6 +22,7 @@ import (
policy_engine "git.frostfs.info/TrueCloudLab/policy-engine/pkg/engine" policy_engine "git.frostfs.info/TrueCloudLab/policy-engine/pkg/engine"
"github.com/mr-tron/base58/base58" "github.com/mr-tron/base58/base58"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/util"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -34,6 +35,8 @@ type cfg struct {
type Service struct { type Service struct {
cfg cfg
waiter Waiter
cnrSrc containercore.Source cnrSrc containercore.Source
contractStorage ape_contract.ProxyAdaptedContractStorage contractStorage ape_contract.ProxyAdaptedContractStorage
@ -41,11 +44,17 @@ type Service struct {
type Option func(*cfg) type Option func(*cfg)
func New(cnrSrc containercore.Source, contractStorage ape_contract.ProxyAdaptedContractStorage, opts ...Option) *Service { type Waiter interface {
WaitTxHalt(context.Context, uint32, util.Uint256) error
}
func New(cnrSrc containercore.Source, contractStorage ape_contract.ProxyAdaptedContractStorage, waiter Waiter, opts ...Option) *Service {
s := &Service{ s := &Service{
cnrSrc: cnrSrc, cnrSrc: cnrSrc,
contractStorage: contractStorage, contractStorage: contractStorage,
waiter: waiter,
} }
for i := range opts { for i := range opts {
@ -84,7 +93,7 @@ func (s *Service) validateContainerTargetRequest(cid string, pubKey *keys.Public
return nil return nil
} }
func (s *Service) AddChain(_ context.Context, req *apemanagerV2.AddChainRequest) (*apemanagerV2.AddChainResponse, error) { func (s *Service) AddChain(ctx context.Context, req *apemanagerV2.AddChainRequest) (*apemanagerV2.AddChainResponse, error) {
pub, err := getSignaturePublicKey(req.GetVerificationHeader()) pub, err := getSignaturePublicKey(req.GetVerificationHeader())
if err != nil { if err != nil {
return nil, err return nil, err
@ -116,7 +125,11 @@ func (s *Service) AddChain(_ context.Context, req *apemanagerV2.AddChainRequest)
return nil, fmt.Errorf("unsupported target type: %s", targetType) return nil, fmt.Errorf("unsupported target type: %s", targetType)
} }
if _, _, err = s.contractStorage.AddMorphRuleChain(apechain.Ingress, target, &chain); err != nil { txHash, vub, err := s.contractStorage.AddMorphRuleChain(apechain.Ingress, target, &chain)
if err != nil {
return nil, err
}
if err := s.waiter.WaitTxHalt(ctx, vub, txHash); err != nil {
return nil, err return nil, err
} }
@ -129,7 +142,7 @@ func (s *Service) AddChain(_ context.Context, req *apemanagerV2.AddChainRequest)
return resp, nil return resp, nil
} }
func (s *Service) RemoveChain(_ context.Context, req *apemanagerV2.RemoveChainRequest) (*apemanagerV2.RemoveChainResponse, error) { func (s *Service) RemoveChain(ctx context.Context, req *apemanagerV2.RemoveChainRequest) (*apemanagerV2.RemoveChainResponse, error) {
pub, err := getSignaturePublicKey(req.GetVerificationHeader()) pub, err := getSignaturePublicKey(req.GetVerificationHeader())
if err != nil { if err != nil {
return nil, err return nil, err
@ -148,7 +161,11 @@ func (s *Service) RemoveChain(_ context.Context, req *apemanagerV2.RemoveChainRe
return nil, fmt.Errorf("unsupported target type: %s", targetType) return nil, fmt.Errorf("unsupported target type: %s", targetType)
} }
if _, _, err = s.contractStorage.RemoveMorphRuleChain(apechain.Ingress, target, req.GetBody().GetChainID()); err != nil { txHash, vub, err := s.contractStorage.RemoveMorphRuleChain(apechain.Ingress, target, req.GetBody().GetChainID())
if err != nil {
return nil, err
}
if err := s.waiter.WaitTxHalt(ctx, vub, txHash); err != nil {
return nil, err return nil, err
} }