Skip to content
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

eos: fixed error reporting in the gRPC client #5015

Merged
merged 1 commit into from
Dec 17, 2024
Merged

eos: fixed error reporting in the gRPC client #5015

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
5 changes: 5 additions & 0 deletions changelog/unreleased/fix-eos-grpc-errors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: fixed error reporting in the EOS gRPC client

This in particular fixes the lock-related errors

https://github.com/cs3org/reva/pull/5015
9 changes: 8 additions & 1 deletion pkg/eosclient/eosgrpc/eosgrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,14 @@ func (c *Client) getRespError(rsp *erpc.NSResponse, err error) error {
return nil
}

return errtypes.InternalError("Err from EOS: " + fmt.Sprintf("%#v", rsp.Error))
switch rsp.Error.Code {
case 16: // EBUSY
return eosclient.FileIsLockedError
case 17: // EEXIST
return eosclient.AttrAlreadyExistsError
default:
return errtypes.InternalError(fmt.Sprintf("%s (code: %d)", rsp.Error.Msg, rsp.Error.Code))
}
}

// Common code to create and initialize a NSRequest.
Expand Down