-
Notifications
You must be signed in to change notification settings - Fork 1k
Scheduled reducer: use timestamp from reducer params for next run
#5574
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.
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
Open
Shubham8287
wants to merge
2
commits into
master
Choose a base branch
from
shub/fix-schedule-ts
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+15
−4
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -548,11 +548,11 @@ fn call_scheduled_reducer_until_done( | |
| let tx = db.begin_mut_tx(IsolationLevel::Serializable, Workload::Internal); | ||
|
|
||
| let params = reducer_call_params_for_queued_item(module_info, db, &tx, item); | ||
| let params = match params { | ||
| let (timestamp, instant, params) = match params { | ||
| // If the function was already deleted, leave the `ScheduledFunction` | ||
| // in the database for when the module restarts. | ||
| Ok(None) => return (CallScheduledFunctionResult { reschedule: None }, false), | ||
| Ok(Some((_timestamp, _instant, params))) => params, | ||
| Ok(Some(params)) => params, | ||
| Err(err) => { | ||
| // All we can do here is log an error. | ||
| log::error!("could not determine scheduled reducer or its parameters: {err:#}"); | ||
|
|
@@ -561,7 +561,16 @@ fn call_scheduled_reducer_until_done( | |
| } | ||
| }; | ||
|
|
||
| call_scheduled_reducer_with_tx(module_info, db, id, tx, params, inst_common, inst) | ||
| call_scheduled_reducer_with_tx( | ||
| module_info, | ||
| db, | ||
| id, | ||
| tx, | ||
| Some((timestamp, instant)), | ||
| params, | ||
| inst_common, | ||
| inst, | ||
| ) | ||
| } | ||
|
|
||
| fn scheduled_item_id(item: &QueueItem) -> Option<ScheduledFunctionId> { | ||
|
|
@@ -571,11 +580,13 @@ fn scheduled_item_id(item: &QueueItem) -> Option<ScheduledFunctionId> { | |
| } | ||
| } | ||
|
|
||
| #[allow(clippy::too_many_arguments)] | ||
| fn call_scheduled_reducer_with_tx( | ||
| module_info: &ModuleInfo, | ||
| db: &RelationalDB, | ||
| id: Option<ScheduledFunctionId>, | ||
| mut tx: MutTxId, | ||
| reschedule_from: Option<(Timestamp, Instant)>, | ||
| params: CallReducerParams, | ||
| inst_common: &mut InstanceCommon, | ||
| inst: &mut impl WasmInstance, | ||
|
|
@@ -605,7 +616,7 @@ fn call_scheduled_reducer_with_tx( | |
| let result = panic::catch_unwind(panic::AssertUnwindSafe(|| { | ||
| inst_common.call_reducer_with_tx(Some(tx), params, inst) | ||
| })); | ||
| let reschedule = delete_scheduled_function_row(module_info, db, id, None, None, inst_common, inst); | ||
| let reschedule = delete_scheduled_function_row(module_info, db, id, None, reschedule_from, inst_common, inst); | ||
|
Comment on lines
-608
to
+619
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the absence of a test, could we change the type signature to always take an explicit timestamp instead of an option? |
||
| // Currently, we drop the return value from the function call. In the future, | ||
| // we might want to handle it somehow. | ||
| let trapped = match result { | ||
|
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same question/suggestion here.