[full-ci] Fix panic while traversing the service list #11390
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jvillafanez
reviewed
Jun 3, 2025
ocis/pkg/runtime/service/service.go
Outdated
| @@ -486,6 +488,8 @@ func (s *Service) List(_ struct{}, reply *string) error { | |||
| table := tablewriter.NewWriter(tableString) | |||
| table.SetHeader([]string{"Service"}) | |||
|
|
|||
| s.mu.Lock() | |||
| defer s.mu.Unlock() | |||
There was a problem hiding this comment.
something to consider is to move the unlock right after the for so the mutex is locked the least amount of time. In this case it isn't a big deal because the function shouldn't take a lot of time to complete, so the mutex should be locked for a little time.
ocis/pkg/runtime/service/service.go
Outdated
| @@ -519,6 +523,8 @@ func trapShutdownCtx(s *Service, srv *http.Server, ctx context.Context) { | |||
| s.Log.Info().Msg("tcp listener shutdown") | |||
| }() | |||
|
|
|||
| s.mu.Lock() | |||
| defer s.mu.Unlock() | |||
There was a problem hiding this comment.
better move the unlock after the for loop, otherwise we'll need to wait until all the services have shutdown of we reach the _defaultInterruptTimeoutDuration timeout; it will take too much time to unlock the mutex and it could block other goroutines for a long time.
|
jvillafanez
approved these changes
Jun 3, 2025
ownclouders
pushed a commit
that referenced
this pull request
Jun 3, 2025
[full-ci] Fix panic while traversing the service list
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix panic while traversing the service list.
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: