Skip to content

Commit ad2b9f5

Browse files
authored
Update Core (#317)
1 parent 21a3f31 commit ad2b9f5

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

temporalio/ext/src/worker.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -597,14 +597,13 @@ fn build_tuner_resource_options<SK: SlotKind>(
597597
.target_cpu_usage(options.member(id!("target_cpu_usage"))?)
598598
.build()
599599
.map_err(|err| error!("Failed building resource slot options: {}", err))?;
600-
if let Some(prev_slots_options) = prev_slots_options {
601-
if slots_options.target_cpu_usage != prev_slots_options.target_cpu_usage
602-
|| slots_options.target_mem_usage != prev_slots_options.target_mem_usage
603-
{
604-
return Err(error!(
605-
"All resource-based slot suppliers must have the same resource-based tuner options"
606-
));
607-
}
600+
if let Some(prev_slots_options) = prev_slots_options
601+
&& (slots_options.target_cpu_usage != prev_slots_options.target_cpu_usage
602+
|| slots_options.target_mem_usage != prev_slots_options.target_mem_usage)
603+
{
604+
return Err(error!(
605+
"All resource-based slot suppliers must have the same resource-based tuner options"
606+
));
608607
}
609608
Ok((
610609
SlotSupplierOptions::ResourceBased(ResourceSlotOptions::new(

temporalio/lib/temporalio/api/payload_visitor.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@ def coresdk_workflow_activation_resolve_nexus_operation(value)
14931493

14941494
def coresdk_workflow_activation_resolve_nexus_operation_start(value)
14951495
@on_enter&.call(value)
1496-
api_failure_v1_failure(value.cancelled_before_start) if value.has_cancelled_before_start?
1496+
api_failure_v1_failure(value.failed) if value.has_failed?
14971497
@on_exit&.call(value)
14981498
end
14991499

0 commit comments

Comments
 (0)