node: support reloading node attributes with SIGHUP #3005
Conversation
End-rey
requested review from
roman-khimov,
carpawell and
cthulhu-rider
as code owners
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3005 +/- ##
==========================================
- Coverage 22.84% 22.83% -0.01%
==========================================
Files 790 790
Lines 58344 58420 +76
==========================================
+ Hits 13328 13340 +12
- Misses 44136 44199 +63
- Partials 880 881 +1 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
- You can compare old/new and avoid updates if nothing changed.
- You're likely to have concurrency problems here when updating
c. - Not sure what
updateLocalStategives us, we want to force node netmap update mostly (send an appropriate tx) and it works the other way around.
End-rey
force-pushed
the
1870-support-reloading-node-attributes-with-sighup
branch
from
b323897
to
59a00ed
Compare
Incorrect expression to check for reconnection. Before that, it worked the other way around, now is fixed. Signed-off-by: Andrey Butusov <andrey@nspcc.io>
Add a new function `cfg.reloadNodeAttributes` that updates the list of node attributes. Add RWMutex for `cfg.cfgNodeInfo.localInfo`. Add docs. Closes #1870. Signed-off-by: Andrey Butusov <andrey@nspcc.io>
End-rey
force-pushed
the
1870-support-reloading-node-attributes-with-sighup
branch
from
59a00ed
to
7a367b0
Compare
| @@ -4,6 +4,7 @@ import ( | |||
| "fmt" | |||
|
|
|||
| "github.com/nspcc-dev/locode-db/pkg/locodedb" | |||
| "github.com/nspcc-dev/neofs-api-go/v2/netmap" | |||
There was a problem hiding this comment.
try to avoid importing neofs-api-go. If u need to extend the type interface in sdk - do it
https://pkg.go.dev/github.com/nspcc-dev/neofs-sdk-go/netmap#NodeInfo.NumberOfAttributes + https://pkg.go.dev/github.com/nspcc-dev/neofs-sdk-go/netmap#NodeInfo.IterateAttributes seems enough
There was a problem hiding this comment.
I need SetAttributes, to clear all the attributes, and GetAttributes, so that I don't have to write a lot of code. I thought if they weren't there, then there was a reason for that. So I can add them?
There was a problem hiding this comment.
feel free to add. Recent similar addition. U may add SetAttributes or ResetAttributes
There was a problem hiding this comment.
And now, how do I use what I've extended? Or will it need to be fixed later, after updating the SDK version? Meanwhile, should I make an issue?
There was a problem hiding this comment.
go get github.com/nspcc-dev/neofs-sdk-go@master
| @@ -97,3 +98,24 @@ func setIfNotEmpty(setter func(string), value string) { | |||
| setter(value) | |||
| } | |||
| } | |||
|
|
|||
| func attrsEqual(arr1, arr2 []netmap.Attribute) bool { | |||
There was a problem hiding this comment.
nodeAttrs actually, we have various attrs
| if value, exists := elements[item.GetKey()]; !exists || value != item.GetValue() { | ||
| return false | ||
| } | ||
| delete(elements, item.GetKey()) |
There was a problem hiding this comment.
i dont think this is needed: elements will always be empty after the loop, wont it?
| // values from config; NOT MODIFY AFTER APP INITIALIZATION | ||
| localInfo netmap.NodeInfo | ||
| // values from config; NOT MODIFY AFTER APP INITIALIZATION OR CONFIG RELOAD | ||
| localInfoLock *sync.RWMutex |
There was a problem hiding this comment.
no need for a pointer
| } | ||
|
|
||
| err = c.bootstrap() | ||
| if err != nil { |
There was a problem hiding this comment.
just return c.bootstrap() if u dont add err context
| @@ -497,6 +497,9 @@ func (c *cfg) NumberOfAddresses() int { | |||
| } | |||
|
|
|||
| func (c *cfg) ExternalAddresses() []string { | |||
| c.cfgNodeInfo.localInfoLock.Lock() | |||
Closes #1870.
Also fix bug from #2998, that incorrectly checked when to reconnect.