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

adm: Take network settings into account during netmap contract update #234

Merged
fyrchik merged 3 commits from acid-ant/frostfs-node:bugfix/100-adm-updt-contract into master 2023-04-14 05:12:51 +00:00
Conversation 0 Commits 3 Files changed 5 +173 -105
acid-ant commented 2023-04-11 08:32:04 +00:00
Member
Copy link

Close #100

Signed-off-by: Anton Nikiforov an.nikiforov@yadro.com

Close #100 Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
acid-ant requested review from storage-core-committers 2023-04-11 08:32:11 +00:00
acid-ant requested review from storage-core-developers 2023-04-11 08:32:12 +00:00
dstepanov-yadro reviewed 2023-04-11 10:29:54 +00:00
cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go Outdated
@ -582,0 +575,4 @@
if method == updateMethodName {
arr, err := c.getNetConfigFromNetmapContract()
if err != nil {
panic(err)
dstepanov-yadro commented 2023-04-11 10:27:07 +00:00
Member
Copy link

Do we really need panic? Maybe return error?

Do we really need panic? Maybe return error?
acid-ant commented 2023-04-11 11:14:35 +00:00
Author
Member
Copy link

Used panic here because don't want to change method signature and this approach was used before in this method.

Used panic here because don't want to change method signature and this approach was used before in this method.
dstepanov-yadro marked this conversation as resolved
fyrchik approved these changes 2023-04-11 11:18:44 +00:00
CHANGELOG.md Outdated
@ -75,3 +76,3 @@
more appropriate for a specific deployment.
Use `__SYSTEM__` prefix for system attributes instead of `__NEOFS__`
Use `__SYSTEM__` prefix for system attributes instead of `__NEOFS__`
fyrchik commented 2023-04-11 11:09:12 +00:00
Owner
Copy link

Unrelated to the commit.

Unrelated to the commit.
acid-ant commented 2023-04-11 12:06:14 +00:00
Author
Member
Copy link

Moved to another commit.

Moved to another commit.
fyrchik marked this conversation as resolved
cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go Outdated
@ -582,0 +582,4 @@
panic(err)
}
for k, v := range m {
if slices.Contains(netmapConfigKeys, k) {
fyrchik commented 2023-04-11 11:10:32 +00:00
Owner
Copy link

Do we really need this dependency? >_<

Do we really need this dependency? >_<
fyrchik commented 2023-04-11 11:11:24 +00:00
Owner
Copy link

I mean we could use it, but let's create a task to use it across the whole repo, I think there are other places which could benefit.

I mean we could use it, but let's create a task to use it across the whole repo, I think there are other places which could benefit.
acid-ant commented 2023-04-11 12:07:13 +00:00
Author
Member
Copy link

Replaced slice with map.

Replaced slice with map.
dstepanov-yadro approved these changes 2023-04-11 11:54:06 +00:00
acid-ant force-pushed bugfix/100-adm-updt-contract from 4d23ac4d7d to 4d19cdc851 2023-04-11 11:59:58 +00:00 Compare
acid-ant force-pushed bugfix/100-adm-updt-contract from 4d19cdc851 to 49f712e0b6 2023-04-11 12:05:49 +00:00 Compare
acid-ant requested review from fyrchik 2023-04-11 12:08:40 +00:00
aarifullin approved these changes 2023-04-11 15:22:13 +00:00
acid-ant force-pushed bugfix/100-adm-updt-contract from 49f712e0b6 to 850d304a10 2023-04-12 08:52:06 +00:00 Compare
fyrchik reviewed 2023-04-12 18:25:02 +00:00
cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go Outdated
@ -86,2 +75,4 @@
alphabetContract,
}, contractList...)
netmapConfigKeys = map[string]any{
fyrchik commented 2023-04-12 18:24:57 +00:00
Owner
Copy link

We use it only in 1 place, can we just iterate over a slice?

We use it only in 1 place, can we just iterate over a slice?
acid-ant commented 2023-04-13 14:45:44 +00:00
Author
Member
Copy link

Done, please review.

Done, please review.
fyrchik marked this conversation as resolved
cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go Outdated
@ -582,0 +574,4 @@
if method == updateMethodName {
arr, err := c.getNetConfigFromNetmapContract()
if err != nil {
panic(err)
fyrchik commented 2023-04-12 18:24:20 +00:00
Owner
Copy link

Why do we panic here?

Why do we panic here?
acid-ant commented 2023-04-13 14:34:42 +00:00
Author
Member
Copy link

Used panic here because don't want to change method signature and this approach was used before in this method.

Used panic here because don't want to change method signature and this approach was used before in this method.
acid-ant force-pushed bugfix/100-adm-updt-contract from 850d304a10 to 9be5652b41 2023-04-13 14:45:17 +00:00 Compare
fyrchik approved these changes 2023-04-14 05:12:40 +00:00
fyrchik merged commit 299b6a6938 into master 2023-04-14 05:12:51 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
dstepanov-yadro
aarifullin
fyrchik
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
badger

Badger DB related issues

  
frostfs-adm

   
frostfs-cli

   
frostfs-ir

   
frostfs-lens

   
frostfs-node

   
good first issue

Good for newcomers

  
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#234
No description provided.
Delete branch "acid-ant/frostfs-node:bugfix/100-adm-updt-contract"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?