Keep trying failed replies #530
Merged
Conversation
This file contains 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
sssoleileraaa
commented
Aug 9, 2019
sssoleileraaa
commented
Aug 9, 2019
| @@ -91,7 +91,8 @@ def test_ApiJob_other_error(mocker): | |||
| mock_api_client = mocker.MagicMock() | |||
| mock_session = mocker.MagicMock() | |||
|
|
|||
| api_job._do_call_api(mock_api_client, mock_session) | |||
| with pytest.raises(Exception): | |||
There was a problem hiding this comment.
A failed job should always raise an exception so the queue processor can log and continue, pause the queue, or drop the job.
redshiftzero
suggested changes
Aug 13, 2019
sssoleileraaa
moved this from In Development
to Ready for review
in SecureDrop Team Board
sssoleileraaa
force-pushed
the
send-reply-timeout-bug
branch
from
0a507a3
to
ed95843
Compare
|
review comments have been addressed |
redshiftzero
approved these changes
Aug 21, 2019
sssoleileraaa
force-pushed
the
send-reply-timeout-bug
branch
from
ed95843
to
2e1ba89
Compare
Closed
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
Fixes #533
Towards #443
Now when SendReplyJob fails because of a timeout, the api call is retried 5 times, and then re-processed in the queue until the timeout issue is resolved.
This is the same behavior for other jobs that receive timeout errors.
Note: This does not fix #294 because that happens when replies are in the queue and never reach the server (the timeout issue is never resolved during the client session).
Test Plan
In addition to making sure the two issues are no longer reproduced, follow these steps to test:
Keyring accessqubes notication popups and reply bar turn red in the guiChecklist
If these changes modify code paths involving cryptography, the opening of files in VMs or network (via the RPC service) traffic, Qubes testing in the staging environment is required. For fine tuning of the graphical user interface, testing in any environment in Qubes is required. Please check as applicable: