From 80bfd08a4758907d3fbcdb3a922fb452c3b1ae13 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 23 Mar 2021 15:44:09 +0300 Subject: [PATCH] [#446] innerring: Use indexer to get relevant inner ring size and index Signed-off-by: Alex Vanin --- cmd/neofs-ir/defaults.go | 3 ++ pkg/innerring/indexer.go | 80 ++++++++++++++++++++++++++++++++++++++ pkg/innerring/innerring.go | 29 ++++++-------- pkg/innerring/state.go | 18 +++++++-- 4 files changed, 110 insertions(+), 20 deletions(-) create mode 100644 pkg/innerring/indexer.go diff --git a/cmd/neofs-ir/defaults.go b/cmd/neofs-ir/defaults.go index 5e860a664..3b51fdb27 100644 --- a/cmd/neofs-ir/defaults.go +++ b/cmd/neofs-ir/defaults.go @@ -2,6 +2,7 @@ package main import ( "strings" + "time" "github.com/nspcc-dev/neofs-node/misc" "github.com/spf13/viper" @@ -108,5 +109,7 @@ func defaultConfiguration(cfg *viper.Viper) { cfg.SetDefault("settlement.basic_income_rate", 0) + cfg.SetDefault("indexer.cache_timeout", 15*time.Second) + cfg.SetDefault("locode.db.path", "") } diff --git a/pkg/innerring/indexer.go b/pkg/innerring/indexer.go new file mode 100644 index 000000000..c42ab3099 --- /dev/null +++ b/pkg/innerring/indexer.go @@ -0,0 +1,80 @@ +package innerring + +import ( + "crypto/ecdsa" + "sync" + "time" + + "github.com/nspcc-dev/neofs-node/pkg/innerring/invoke" + "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/pkg/errors" +) + +type innerRingIndexer struct { + sync.RWMutex + + cli *client.Client + key *ecdsa.PublicKey + timeout time.Duration + + innerRingIndex, innerRingSize int32 + + lastAccess time.Time +} + +func newInnerRingIndexer(cli *client.Client, key *ecdsa.PublicKey, to time.Duration) *innerRingIndexer { + return &innerRingIndexer{ + cli: cli, + key: key, + timeout: to, + } +} + +func (s *innerRingIndexer) update() (err error) { + s.RLock() + + if time.Since(s.lastAccess) < s.timeout { + s.RUnlock() + return nil + } + + s.RUnlock() + + s.Lock() + defer s.Unlock() + + if time.Since(s.lastAccess) < s.timeout { + return nil + } + + s.innerRingIndex, s.innerRingSize, err = invoke.InnerRingIndex(s.cli, s.key) + if err != nil { + return err + } + + s.lastAccess = time.Now() + + return nil +} + +func (s *innerRingIndexer) InnerRingIndex() (int32, error) { + if err := s.update(); err != nil { + return 0, errors.Wrap(err, "can't update index state") + } + + s.RLock() + defer s.RUnlock() + + return s.innerRingIndex, nil +} + +func (s *innerRingIndexer) InnerRingSize() (int32, error) { + if err := s.update(); err != nil { + return 0, errors.Wrap(err, "can't update index state") + } + + s.RLock() + defer s.RUnlock() + + return s.innerRingSize, nil +} diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 9cbb6a9e9..2e04014ed 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -48,13 +48,12 @@ type ( epochTimer *timers.BlockTimer // global state - morphClient *client.Client - mainnetClient *client.Client - epochCounter atomic.Uint64 - innerRingIndex atomic.Int32 - innerRingSize atomic.Int32 - precision precision.Fixed8Converter - auditClient *auditWrapper.ClientWrapper + morphClient *client.Client + mainnetClient *client.Client + epochCounter atomic.Uint64 + statusIndex *innerRingIndexer + precision precision.Fixed8Converter + auditClient *auditWrapper.ClientWrapper notaryDepositAmount fixedn.Fixed8 notaryDuration uint32 @@ -297,6 +296,12 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error server.pubKey = crypto.MarshalPublicKey(&server.key.PublicKey) + server.statusIndex = newInnerRingIndexer( + server.morphClient, + &server.key.PublicKey, + cfg.GetDuration("indexer.cache_timeout"), + ) + auditPool, err := ants.NewPool(cfg.GetInt("audit.task.exec_pool_size")) if err != nil { return nil, err @@ -711,14 +716,6 @@ func (s *Server) initConfigFromBlockchain() error { return errors.Wrap(err, "can't read epoch") } - key := &s.key.PublicKey - - // check if node inside inner ring list and what index it has - index, size, err := invoke.InnerRingIndex(s.mainnetClient, key) - if err != nil { - return errors.Wrap(err, "can't read inner ring list") - } - // get balance precision balancePrecision, err := invoke.BalancePrecision(s.morphClient, s.contracts.balance) if err != nil { @@ -726,8 +723,6 @@ func (s *Server) initConfigFromBlockchain() error { } s.epochCounter.Store(uint64(epoch)) - s.innerRingSize.Store(size) - s.innerRingIndex.Store(index) s.precision.SetBalancePrecision(balancePrecision) s.log.Debug("read config from blockchain", diff --git a/pkg/innerring/state.go b/pkg/innerring/state.go index 89cdccbd2..fca990f28 100644 --- a/pkg/innerring/state.go +++ b/pkg/innerring/state.go @@ -21,19 +21,31 @@ func (s *Server) SetEpochCounter(val uint64) { // IsActive is a getter for a global active flag state. func (s *Server) IsActive() bool { - return s.innerRingIndex.Load() >= 0 + return s.Index() >= 0 } // Index is a getter for a global index of node in inner ring list. Negative // index means that node is not in the inner ring list. func (s *Server) Index() int { - return int(s.innerRingIndex.Load()) + index, err := s.statusIndex.InnerRingIndex() + if err != nil { + s.log.Error("can't get inner ring index", zap.String("error", err.Error())) + return -1 + } + + return int(index) } // InnerRingSize is a getter for a global size of inner ring list. This value // paired with inner ring index. func (s *Server) InnerRingSize() int { - return int(s.innerRingSize.Load()) + size, err := s.statusIndex.InnerRingSize() + if err != nil { + s.log.Error("can't get inner ring size", zap.String("error", err.Error())) + return 0 + } + + return int(size) } func (s *Server) voteForSidechainValidator(validators []keys.PublicKey) error {