TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 100 Pull requests 4 Projects Releases 1 Activity Actions

[#1496] node/control: Await until SetNetmapStatus() persists
All checks were successful
Tests and linters / Run gofumpt (pull_request) Successful in 1m25s
Details
DCO action / DCO (pull_request) Successful in 1m51s
Details
Vulncheck / Vulncheck (pull_request) Successful in 2m17s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 2m31s
Details
Build / Build Components (pull_request) Successful in 2m48s
Details
Tests and linters / gopls check (pull_request) Successful in 3m2s
Details
Tests and linters / Staticcheck (pull_request) Successful in 3m15s
Details
Tests and linters / Lint (pull_request) Successful in 4m9s
Details
Tests and linters / Tests (pull_request) Successful in 4m44s
Details
Tests and linters / Tests with -race (pull_request) Successful in 5m51s
Details

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-11-14 15:09:42 +03:00
parent f8b217cdb0
commit 1863647a75
Signed by: fyrchik
SSH key fingerprint: SHA256:m/TTwCzjnRkXgnzEx9X92ccxy1CcVeinOgDb3NPWWmg
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/frostfs-node/netmap.go
View file

@ -421,8 +421,11 @@ func (c *cfg) updateNetMapState(ctx context.Context, stateSetter func(*nmClient.
prm.SetKey(c.key.PublicKey().Bytes()) prm.SetKey(c.key.PublicKey().Bytes())
stateSetter(&prm) stateSetter(&prm)
_, err := c.cfgNetmap.wrapper.UpdatePeerState(ctx, prm) res, err := c.cfgNetmap.wrapper.UpdatePeerState(ctx, prm)
return err if err != nil {
return err
}
return c.cfgNetmap.wrapper.Morph().WaitTxHalt(ctx, res)
} }
type netInfo struct { type netInfo struct {

4
pkg/morph/client/netmap/peer.go
View file

@ -58,9 +58,9 @@ func (c *Client) ForceRemovePeer(ctx context.Context, nodeInfo netmap.NodeInfo,
prm.SetControlTX(true) prm.SetControlTX(true)
prm.SetVUB(vub) prm.SetVUB(vub)
vub, err := c.UpdatePeerState(ctx, prm) res, err := c.UpdatePeerState(ctx, prm)
if err != nil { if err != nil {
return 0, fmt.Errorf("updating peer state: %v", err) return 0, fmt.Errorf("updating peer state: %v", err)
} }
return vub, nil return res.VUB, nil
} }

9
pkg/morph/client/netmap/update_state.go
View file

@ -2,7 +2,6 @@ package netmap
import ( import (
"context" "context"
"fmt"
"git.frostfs.info/TrueCloudLab/frostfs-contract/netmap" "git.frostfs.info/TrueCloudLab/frostfs-contract/netmap"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
@ -37,7 +36,7 @@ func (u *UpdatePeerPrm) SetMaintenance() {
} }
// UpdatePeerState changes peer status through Netmap contract call. // UpdatePeerState changes peer status through Netmap contract call.
func (c *Client) UpdatePeerState(ctx context.Context, p UpdatePeerPrm) (uint32, error) { func (c *Client) UpdatePeerState(ctx context.Context, p UpdatePeerPrm) (client.InvokeRes, error) {
method := updateStateMethod method := updateStateMethod
if c.client.WithNotary() && c.client.IsAlpha() { if c.client.WithNotary() && c.client.IsAlpha() {
@ -56,9 +55,5 @@ func (c *Client) UpdatePeerState(ctx context.Context, p UpdatePeerPrm) (uint32,
prm.SetArgs(int64(p.state), p.key) prm.SetArgs(int64(p.state), p.key)
prm.InvokePrmOptional = p.InvokePrmOptional prm.InvokePrmOptional = p.InvokePrmOptional
res, err := c.client.Invoke(ctx, prm) return c.client.Invoke(ctx, prm)
if err != nil {
return 0, fmt.Errorf("could not invoke smart contract: %w", err)
}
return res.VUB, nil
} }