Skip to content

Commit 3695fb2

Browse files
Rebase change
1 parent 12b8c3a commit 3695fb2

File tree

2 files changed

+4
-2
lines changed
  • crates
    • types/src/invocation
    • worker/src/partition/state_machine/lifecycle

2 files changed

+4
-2
lines changed

crates/types/src/invocation/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,6 @@ pub struct PurgeInvocationRequest {
978978
pub response_sink: Option<InvocationMutationResponseSink>,
979979
/// When epoch is the current/latest epoch, all the other epochs will be cleaned up as well.
980980
#[serde(default, skip_serializing_if = "num_traits::Zero::is_zero")]
981-
#[bilrost(6)]
982981
pub invocation_epoch: InvocationEpoch,
983982
}
984983

@@ -1165,12 +1164,14 @@ pub mod restart {
11651164
///
11661165
/// To retain the previous attempt, the new attempt will take the invocation id of the previous attempt, the one used to trigger this reset,
11671166
/// and old invocation id will take a new randomly generated invocation id.
1167+
#[serde(default, skip_serializing_if = "Option::is_none")]
11681168
pub previous_attempt_retention: Option<Duration>,
11691169

11701170
/// What to do in case the invocation was a Workflow run (workflow service and workflow handler type)
11711171
pub apply_to_workflow_run: ApplyToWorkflowRun,
11721172

11731173
/// Where to send the response for this command
1174+
#[serde(default, skip_serializing_if = "Option::is_none")]
11741175
pub response_sink: Option<InvocationMutationResponseSink>,
11751176
}
11761177

crates/worker/src/partition/state_machine/lifecycle/restart.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,12 @@ where
297297
completion_range_epoch_map: invocation.completion_range_epoch_map,
298298
journal_metadata: invocation.journal_metadata,
299299
hotfix_apply_cancellation_after_deployment_is_pinned: false,
300+
created_using_restate_version: invocation.created_using_restate_version,
300301

301302
// Reset the pinned deployment
302303
pinned_deployment: None,
303304
// Reset timestamps
304-
timestamps: StatusTimestamps::now(),
305+
timestamps: StatusTimestamps::init(),
305306
// Reset response sinks
306307
response_sinks: Default::default(),
307308
};

0 commit comments

Comments
 (0)