s192 - Perform retries on runTask/updateTask #33
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
jlorper
commented
Jan 31, 2025
| lockAcquisition.commit(); | ||
|
|
||
| // actual task execution | ||
| runAndUpdateTask(jobState.getShardedJobId(), taskId, sequenceNumber, jobState, taskState); |
There was a problem hiding this comment.
I think this was triggering the DatastoreException, not being caught, so reaching the servlet execution
jlorper
commented
Jan 31, 2025
| ShardRetryState<T> retryState = null; | ||
| Transaction postRunUpdate = null; //txn limited to 60s, so can't open this before run() call | ||
|
|
||
| RetryType retryType = RetryType.NONE; |
There was a problem hiding this comment.
reorganized the code, so all the handle failures happens at the end, and with retries
jlorper
commented
Jan 31, 2025
| } catch (Throwable ex) { | ||
| postRunUpdate = getDatastore().newTransaction(); | ||
| t = ex; | ||
| retryType = RetryType.SLICE; // this was originally shard, but seems like a mistake |
There was a problem hiding this comment.
Note this change:
- message (slice error) and action (shard failure) were inconsistent
- probably makes sense to handle it as slice failure rather than prematurely kill the shard?
jlorper
commented
Jan 31, 2025
| } | ||
| rollbackIfActive(postRunUpdate); | ||
| RetryExecutor.call(FOREVER_RETRYER, () -> { |
There was a problem hiding this comment.
in the finally, perform the handle error (if any) + update task
eschultink
approved these changes
Jan 31, 2025
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.
Fixes
javax.servlet.ServletException: com.google.cloud.datastore.DatastoreException: Optimstic transaction was abortedTry to better control places were commits are done and apply retries if needed.
Change implications