TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 105 Pull requests 11 Projects Releases 2 Activity Actions

policer: Simplify processRepNodes() checks #1605

Merged
fyrchik merged 2 commits from fyrchik/frostfs-node:refactor-policer into master 2025-01-21 05:34:55 +00:00
Conversation 0 Commits 2 Files changed 2 +55 -60
fyrchik commented 2025-01-17 09:40:51 +00:00
Owner
Copy link

Hopefully, it is easier to read now.

Current flow is hard to reason about, #1601 is a notorious example of
accidental complexity.

  1. Remove multiple nested ifs, use depth=1.
  2. Process each status exactly once, hopefully preventing bugs like
    #1601.

Signed-off-by: Evgenii Stratonikov e.stratonikov@yadro.com

Hopefully, it is easier to read now. Current flow is hard to reason about, #1601 is a notorious example of accidental complexity. 1. Remove multiple nested ifs, use depth=1. 2. Process each status exactly once, hopefully preventing bugs like #1601. Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
🎉 1
fyrchik added the
refactoring
internal
 labels 2025-01-17 09:40:51 +00:00
fyrchik added 1 commit 2025-01-17 09:40:51 +00:00
policer: Simplify processRepNodes() checks
Some checks failed
Tests and linters / Run gofumpt (pull_request) Successful in 24s
Details
DCO action / DCO (pull_request) Failing after 31s
Details
Vulncheck / Vulncheck (pull_request) Successful in 1m17s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 1m30s
Details
Build / Build Components (pull_request) Successful in 1m47s
Details
Tests and linters / Staticcheck (pull_request) Successful in 2m26s
Details
Tests and linters / Lint (pull_request) Successful in 3m26s
Details
Tests and linters / Tests (pull_request) Successful in 4m13s
Details
Tests and linters / Tests with -race (pull_request) Successful in 4m36s
Details
Tests and linters / gopls check (pull_request) Successful in 5m19s
Details
5447d3f4e9 
Current flow is hard to reason about, #1601 is a notorious example of
accidental complexity.
1. Remove multiple nested ifs, use depth=1.
2. Process each status exactly once, hopefully preventing bugs like
   #1601.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
fyrchik requested review from storage-core-committers 2025-01-17 09:40:52 +00:00
fyrchik requested review from storage-core-developers 2025-01-17 09:40:52 +00:00
fyrchik force-pushed refactor-policer from 5447d3f4e9 to 87e7122aa7 2025-01-17 09:41:34 +00:00 Compare
fyrchik force-pushed refactor-policer from 87e7122aa7 to 9e2182e1a2 2025-01-17 10:19:28 +00:00 Compare
a-savchuk approved these changes 2025-01-17 10:41:08 +00:00
Dismissed
fyrchik added this to the v0.45.0 milestone 2025-01-17 12:32:46 +00:00
acid-ant approved these changes 2025-01-20 06:29:31 +00:00
Dismissed
dstepanov-yadro reviewed 2025-01-20 09:32:45 +00:00
pkg/services/policer/check.go Outdated
@ -138,0 +139,4 @@
case nodeHoldsObject:
shortage--
case nodeDoesNotHoldObject:
if !cached {
dstepanov-yadro commented 2025-01-20 09:32:45 +00:00
Member
Copy link

While we're here, is it possible to get rid of this nested if? For example, I can't understand what this condition means.

While we're here, is it possible to get rid of this nested `if`? For example, I can't understand what this condition means.
dstepanov-yadro commented 2025-01-20 09:37:55 +00:00
Member
Copy link

Why is it that when we receive the error "object not found" from a node (st == nodeDoesNotHoldObject), and we have not previously requested information on this node (false == cached), we do not remove the node from the list of nodes?

Why is it that when we receive the error "object not found" from a node (`st == nodeDoesNotHoldObject`), and we have not previously requested information on this node (`false == cached`), we do not remove the node from the list of nodes?
fyrchik commented 2025-01-20 10:43:16 +00:00
Author
Owner
Copy link

I don't like it too, have already tried get rid of this if.
Will try again harder, stay tuned.

I don't like it too, have already tried get rid of this `if`. Will try again harder, stay tuned.
fyrchik commented 2025-01-20 11:12:16 +00:00
Author
Owner
Copy link

@dstepanov-yadro I have updated the code, please take a look.

@dstepanov-yadro I have updated the code, please take a look.
fyrchik changed title from policer: Simplify processRepNodes() checks to WIP: policer: Simplify processRepNodes() checks 2025-01-20 10:43:40 +00:00
fyrchik force-pushed refactor-policer from 9e2182e1a2 to 98e7033123 2025-01-20 11:11:58 +00:00 Compare
fyrchik dismissed a-savchuk's review 2025-01-20 11:11:58 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

fyrchik dismissed acid-ant's review 2025-01-20 11:11:58 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

fyrchik changed title from WIP: policer: Simplify processRepNodes() checks to policer: Simplify processRepNodes() checks 2025-01-20 11:12:28 +00:00
fyrchik requested review from storage-core-committers 2025-01-20 11:12:29 +00:00
fyrchik requested review from storage-core-developers 2025-01-20 11:12:29 +00:00
fyrchik changed title from policer: Simplify processRepNodes() checks to WIP: policer: Simplify processRepNodes() checks 2025-01-20 11:13:05 +00:00
fyrchik changed title from WIP: policer: Simplify processRepNodes() checks to policer: Simplify processRepNodes() checks 2025-01-20 11:13:34 +00:00
fyrchik added 1 commit 2025-01-20 13:10:31 +00:00
policer: Do not mutate slice under iteration
Some checks failed
DCO action / DCO (pull_request) Failing after 32s
Details
Vulncheck / Vulncheck (pull_request) Successful in 1m7s
Details
Build / Build Components (pull_request) Successful in 1m40s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 1m41s
Details
Tests and linters / gopls check (pull_request) Successful in 2m30s
Details
Tests and linters / Tests with -race (pull_request) Successful in 2m37s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 3m3s
Details
Tests and linters / Lint (pull_request) Successful in 3m29s
Details
Tests and linters / Staticcheck (pull_request) Successful in 3m25s
Details
Tests and linters / Tests (pull_request) Successful in 6m14s
Details
d24cbb0b1d 
Nothing wrong with it, besides being difficult to read.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
fyrchik force-pushed refactor-policer from d24cbb0b1d to 94ed520eba 2025-01-20 13:11:11 +00:00 Compare
fyrchik force-pushed refactor-policer from 94ed520eba to 106446f12d 2025-01-20 13:13:12 +00:00 Compare
a-savchuk approved these changes 2025-01-20 13:19:07 +00:00
fyrchik force-pushed refactor-policer from 106446f12d to 3d953d7185 2025-01-20 13:30:16 +00:00 Compare
dstepanov-yadro approved these changes 2025-01-20 14:09:23 +00:00
fyrchik merged commit 951a7ee1c7 into master 2025-01-21 05:34:55 +00:00
fyrchik deleted branch refactor-policer 2025-01-21 05:34:59 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
a-savchuk
dstepanov-yadro
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
v0.45.0
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#1605
No description provided.
Delete branch "fyrchik/frostfs-node:refactor-policer"

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?