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

morph: Fix panic when closing morph client #760

Merged
fyrchik merged 1 commit from acid-ant/frostfs-node:bugfix/749-morph-client-panic into master 2023-11-01 10:48:15 +00:00
Conversation 0 Commits 1 Files changed 5 +49 -18
acid-ant commented 2023-10-27 12:13:04 +00:00
Member
Copy link

Close #749

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

Close #749 Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
fyrchik approved these changes 2023-10-27 13:45:07 +00:00
pkg/morph/event/listener.go Outdated
@ -172,6 +178,8 @@ func (l *listener) listen(ctx context.Context, intError chan<- error) error {
}
func (l *listener) subscribe(errCh chan error) {
l.wg.Add(1)
fyrchik commented 2023-10-27 13:39:52 +00:00
Owner
Copy link

It it not a goroutine, do we need wg here?

It it not a goroutine, do we need wg here?
acid-ant commented 2023-10-27 15:04:35 +00:00
Author
Member
Copy link

It is routine 6f60884bb4/pkg/morph/event/listener.go (L173)

It is routine https://git.frostfs.info/TrueCloudLab/frostfs-node/src/commit/6f60884bb49dc7c63633855926520f14804a505b/pkg/morph/event/listener.go#L173
fyrchik marked this conversation as resolved
pkg/morph/event/listener.go Outdated
@ -235,7 +255,7 @@ loop:
if !ok {
l.log.Warn(logs.EventStopEventListenerByNotificationChannel)
if intErr != nil {
fyrchik commented 2023-10-27 13:40:45 +00:00
Owner
Copy link

May be also move if intErr != nil logic in function?

May be also move `if intErr != nil` logic in function?
acid-ant commented 2023-10-27 15:09:48 +00:00
Author
Member
Copy link

The idea was to avoid allocation of error to pass it to the function which should send it. How about to pass string only and allocate error inside the function?

The idea was to avoid allocation of error to pass it to the function which should send it. How about to pass string only and allocate error inside the function?
fyrchik commented 2023-10-27 15:30:55 +00:00
Owner
Copy link

Ah, yeah, missed that.
But the error could easily be moved to a global varable, it is always the same.

Ah, yeah, missed that. But the error could easily be moved to a global varable, it is always the same.
👍 1
fyrchik marked this conversation as resolved
acid-ant requested review from storage-core-committers 2023-10-27 15:01:12 +00:00
acid-ant requested review from storage-core-developers 2023-10-27 15:01:13 +00:00
acid-ant force-pushed bugfix/749-morph-client-panic from 6f60884bb4 to 84c2453710 2023-10-27 17:56:10 +00:00 Compare
fyrchik approved these changes 2023-10-30 06:59:07 +00:00
fyrchik added this to the v0.38.0 milestone 2023-10-30 07:03:43 +00:00
fyrchik reviewed 2023-10-31 10:03:34 +00:00
pkg/morph/event/listener.go Outdated
@ -213,2 +227,4 @@
}
func (l *listener) sendError(ctx context.Context, intErr chan<- error, err error) bool {
if intErr != nil {
fyrchik commented 2023-10-31 10:03:34 +00:00
Owner
Copy link

nitpick, mut maybe if intErr == nil { return false } and reduce indentation for other code?

nitpick, mut maybe `if intErr == nil { return false }` and reduce indentation for other code?
acid-ant commented 2023-10-31 10:14:39 +00:00
Author
Member
Copy link

Agree, updated.

Agree, updated.
fyrchik marked this conversation as resolved
acid-ant force-pushed bugfix/749-morph-client-panic from 84c2453710 to e74b2cd5c3 2023-10-31 10:14:17 +00:00 Compare
dstepanov-yadro approved these changes 2023-10-31 14:30:14 +00:00
acid-ant force-pushed bugfix/749-morph-client-panic from e74b2cd5c3 to 7217394620 2023-11-01 05:48:38 +00:00 Compare
fyrchik merged commit a26483fc30 into master 2023-11-01 10:48:15 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
fyrchik
dstepanov-yadro
TrueCloudLab/storage-core-developers
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.38.0
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 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#760
No description provided.
Delete branch "acid-ant/frostfs-node:bugfix/749-morph-client-panic"

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?