Skip to content

engine: use an unlocked version of Get() in processAddrDelete() #3837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roman-khimov merged 1 commit into from
Feb 19, 2026
+6 −1
Merged

engine: use an unlocked version of Get() in processAddrDelete() #3837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changelog for NeoFS Node

### Fixed
- Resending the header after chunks have already been sent in object service `Get` handler (#3833)
- GC deadlock on local object storage shutdown (#3837)

### Changed

Expand Down
4 changes: 4 additions & 0 deletions pkg/local_object_storage/engine/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ func (e *StorageEngine) Get(addr oid.Address) (*object.Object, error) {
if e.blockErr != nil {
return nil, e.blockErr
}
return e.getInt(addr)
}

// getInt is an unlocked version of Get.
func (e *StorageEngine) getInt(addr oid.Address) (*object.Object, error) {
var (
err error
obj *object.Object
Expand Down
2 changes: 1 addition & 1 deletion pkg/local_object_storage/engine/inhume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (e *StorageEngine) processAddrDelete(addr oid.Address, deleteFunc func(*sha
linkAddr.SetContainer(addr.Container())
linkAddr.SetObject(linkID)

linkObj, err := e.Get(linkAddr)
linkObj, err := e.getInt(linkAddr)
if err != nil {
e.log.Debug("inhuming root object but no link object is found",
zap.Stringer("linkAddr", linkAddr),
Expand Down
Loading