Skip to content

Commit

Permalink
Merge branch 'RESTAPI-1048-timeout-response' into 'master'
Browse files Browse the repository at this point in the history
Fix response in task after timeout in one of the commands

See merge request firecrest/firecrest!291
  • Loading branch information
ekouts committed Apr 9, 2024
2 parents 7d33dc5 + 8418ca2 commit 63dac78
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Add the endpoints `/compute/nodes` and `/compute/nodes/{nodeName}` to retrieve information about nodes in the scheduling queue.
- Added endpoints `POST /utilities/compress`, `POST /utilities/extract`, `POST /storage/xfer-internal/compress` and `POST /storage/xfer-internal/extract` for file compression and extraction.
- Added recurisive option to ls utilities command `&recursive=true`
- Added recurisive option to ls utilities command `&recursive=true`.

### Changed

### Fixed

- Fixed error on pipeline when releasing production version
- Fixed error on pipeline when releasing production version.
- Fixed response in task after timeout in one of the commands.

## [1.15.0]

Expand Down
2 changes: 2 additions & 0 deletions src/common/cscs_api_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,8 @@ def exec_remote_command(headers, system_name, system_addr, action, file_transfer

elif stderr_errno == 7:
result = {"error": 7, "msg": "Failed to connect to staging area server"}
elif stderr_errno == 124:
result = {"error": 124, "msg": "Command has finished with timeout signal"}
else:
result = {"error": stderr_errno, "msg": stderr_errda or stdout_errda}
elif len(stderr_errda) > 0:
Expand Down

0 comments on commit 63dac78

Please sign in to comment.