[#787] netmap: Refactor `NewEpoch` method
DCO action / DCO (pull_request) Successful in 3m58s
Details
Vulncheck / Vulncheck (pull_request) Successful in 4m51s
Details
Build / Build Components (1.21) (pull_request) Successful in 5m47s
Details
Build / Build Components (1.20) (pull_request) Successful in 5m57s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 6m25s
Details
Tests and linters / Staticcheck (pull_request) Successful in 6m31s
Details
Tests and linters / Lint (pull_request) Successful in 7m15s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 7m16s
Details
Tests and linters / Tests with -race (pull_request) Successful in 8m30s
Details
DCO action / DCO (pull_request) Successful in 3m58s
Details
Vulncheck / Vulncheck (pull_request) Successful in 4m51s
Details
Build / Build Components (1.21) (pull_request) Successful in 5m47s
Details
Build / Build Components (1.20) (pull_request) Successful in 5m57s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 6m25s
Details
Tests and linters / Staticcheck (pull_request) Successful in 6m31s
Details
Tests and linters / Lint (pull_request) Successful in 7m15s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 7m16s
Details
Tests and linters / Tests with -race (pull_request) Successful in 8m30s
Details
Split for user and control methods. Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>pull/790/head
parent
c8a62ffedd
commit
8088063195
|
@ -45,8 +45,7 @@ func (w *netmapClientWrapper) NetMap() (*netmap.NetMap, error) {
|
|||
}
|
||||
|
||||
func (w *netmapClientWrapper) NewEpoch(epoch uint64) error {
|
||||
_, err := w.netmapClient.NewEpoch(epoch, 0, false)
|
||||
return err
|
||||
return w.netmapClient.NewEpoch(epoch)
|
||||
}
|
||||
|
||||
func (w *netmapClientWrapper) MorphIsValidScript(script []byte, signers []transaction.Signer) (valid bool, err error) {
|
||||
|
|
|
@ -8,15 +8,27 @@ import (
|
|||
|
||||
// NewEpoch updates FrostFS epoch number through
|
||||
// Netmap contract call.
|
||||
// If `force` is true, this call is normally initiated by a control
|
||||
// service command and uses a control notary transaction internally
|
||||
// to ensure all nodes produce the same transaction with high probability.
|
||||
// If vub > 0, vub will be used as valid until block value.
|
||||
func (c *Client) NewEpoch(epoch uint64, vub uint32, force bool) (uint32, error) {
|
||||
func (c *Client) NewEpoch(epoch uint64) error {
|
||||
prm := client.InvokePrm{}
|
||||
prm.SetMethod(newEpochMethod)
|
||||
prm.SetArgs(epoch)
|
||||
prm.SetControlTX(force)
|
||||
|
||||
_, err := c.client.Invoke(prm)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not invoke method (%s): %w", newEpochMethod, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// NewEpochControl updates FrostFS epoch number through
|
||||
// control notary transaction internally to ensure all
|
||||
// nodes produce the same transaction with high probability.
|
||||
// If vub > 0, vub will be used as valid until block value.
|
||||
func (c *Client) NewEpochControl(epoch uint64, vub uint32) (uint32, error) {
|
||||
prm := client.InvokePrm{}
|
||||
prm.SetMethod(newEpochMethod)
|
||||
prm.SetArgs(epoch)
|
||||
prm.SetControlTX(true)
|
||||
prm.SetVUB(vub)
|
||||
|
||||
res, err := c.client.Invoke(prm)
|
||||
|
|
|
@ -53,7 +53,7 @@ func (s *Server) TickEpoch(_ context.Context, req *control.TickEpochRequest) (*c
|
|||
return nil, fmt.Errorf("getting current epoch: %w", err)
|
||||
}
|
||||
|
||||
vub, err := s.netmapClient.NewEpoch(epoch+1, req.GetBody().GetVub(), true)
|
||||
vub, err := s.netmapClient.NewEpochControl(epoch+1, req.GetBody().GetVub())
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("forcing new epoch: %w", err)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue