Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions temporalio/ext/src/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -597,14 +597,13 @@ fn build_tuner_resource_options<SK: SlotKind>(
.target_cpu_usage(options.member(id!("target_cpu_usage"))?)
.build()
.map_err(|err| error!("Failed building resource slot options: {}", err))?;
if let Some(prev_slots_options) = prev_slots_options {
if slots_options.target_cpu_usage != prev_slots_options.target_cpu_usage
|| slots_options.target_mem_usage != prev_slots_options.target_mem_usage
{
return Err(error!(
"All resource-based slot suppliers must have the same resource-based tuner options"
));
}
if let Some(prev_slots_options) = prev_slots_options
&& (slots_options.target_cpu_usage != prev_slots_options.target_cpu_usage
|| slots_options.target_mem_usage != prev_slots_options.target_mem_usage)
{
return Err(error!(
"All resource-based slot suppliers must have the same resource-based tuner options"
));
}
Ok((
SlotSupplierOptions::ResourceBased(ResourceSlotOptions::new(
Expand Down
2 changes: 1 addition & 1 deletion temporalio/lib/temporalio/api/payload_visitor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ def coresdk_workflow_activation_resolve_nexus_operation(value)

def coresdk_workflow_activation_resolve_nexus_operation_start(value)
@on_enter&.call(value)
api_failure_v1_failure(value.cancelled_before_start) if value.has_cancelled_before_start?
api_failure_v1_failure(value.failed) if value.has_failed?
@on_exit&.call(value)
end

Expand Down
Loading
Loading