Skip to content
Draft
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
77 changes: 13 additions & 64 deletions loadgen/kitchen-sink-gen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ use crate::protos::temporal::{
execute_activity_action::{ClientActivity, PayloadActivity},
with_start_client_action, Action, ActionSet, AwaitWorkflowState, AwaitableChoice,
ClientAction, ClientActionSet, ClientSequence, DoQuery, DoSignal, DoUpdate,
execute_nexus_operation,
ExecuteActivityAction, ExecuteChildWorkflowAction, ExecuteNexusOperation,
HandlerInvocation, RemoteActivityOptions, ReturnResultAction, SetPatchMarkerAction,
HandlerInvocation, RemoteActivityOptions, ReturnResultAction, SetPatchMarkerAction, SyncCall,
TestInput, TimerAction, UpsertMemoAction, UpsertSearchAttributesAction,
WithStartClientAction, WorkflowInput, WorkflowState,
},
Expand Down Expand Up @@ -618,12 +619,7 @@ impl<'a> Arbitrary<'a> for Action {
} else if chances.nested_action_set(action_kind) {
action::Variant::NestedActionSet(u.arbitrary()?)
} else if chances.nexus_operation(action_kind) {
if ARB_CONTEXT.with_borrow(|c| c.action_set_nest_level >= 1) {
// Nested nexus operations are not supported, use echo-sync instead
action::Variant::NexusOperation(ExecuteNexusOperation::echo_sync(u)?)
} else {
action::Variant::NexusOperation(u.arbitrary()?)
}
action::Variant::NexusOperation(u.arbitrary()?)
} else {
unreachable!()
};
Expand Down Expand Up @@ -712,71 +708,24 @@ impl<'a> Arbitrary<'a> for ExecuteChildWorkflowAction {
}
}

static NEXUS_OPERATIONS: [&str; 2] = ["echo-sync", "echo-async"];

impl ExecuteNexusOperation {
fn echo_sync(u: &mut Unstructured<'_>) -> arbitrary::Result<Self> {
impl<'a> Arbitrary<'a> for ExecuteNexusOperation {
fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result<Self> {
// The fuzzer only generates echo-sync; echo-async needs deterministic coordination
// (caller-driven completion of the kitchenSink handler) that doesn't compose under
// random action generation.
let val = format!("nexus-test-{}", u.int_in_range(1..=1000)?);
Ok(Self {
endpoint: ARB_CONTEXT.with_borrow(|c| c.nexus_endpoint.clone()),
operation: "echo-sync".to_string(),
input: val.clone(),
expected_output: val,
headers: Default::default(),
// echo-sync completes immediately, so only WaitFinish is valid.
awaitable_choice: Some(AwaitableChoice {
condition: Some(awaitable_choice::Condition::WaitFinish(())),
}),
before_actions: vec![],
handler_workflow_id: String::new(),
handler_workflow_id_conflict_policy: 0,
wait_for_signal: false,
})
}
}

impl<'a> Arbitrary<'a> for ExecuteNexusOperation {
fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result<Self> {
let &operation = u.choose(&NEXUS_OPERATIONS)?;

if operation == "echo-sync" {
return Self::echo_sync(u);
}

let endpoint = ARB_CONTEXT.with_borrow(|c| c.nexus_endpoint.clone());
let val = format!("nexus-test-{}", u.int_in_range(1..=1000)?);
let (input, expected_output) = (val.clone(), val);

// Randomly generate before_actions for echo-async operations
let before_actions = if u.ratio(1, 3)? {
ARB_CONTEXT.with_borrow_mut(|c| c.action_set_nest_level += 1);
let num_actions =
u.int_in_range(1..=ARB_CONTEXT.with_borrow(|c| c.config.max_actions_per_set))?;
let mut actions: Vec<Action> = Vec::with_capacity(num_actions);
for _ in 0..num_actions {
actions.push(u.arbitrary()?);
}
ARB_CONTEXT.with_borrow_mut(|c| c.action_set_nest_level -= 1);
vec![ActionSet {
actions,
concurrent: false,
}]
} else {
vec![]
};

// echo-async supports all awaitable choices including cancellation.
Ok(Self {
endpoint,
operation: operation.to_string(),
input,
headers: Default::default(),
awaitable_choice: Some(u.arbitrary()?),
expected_output,
before_actions,
handler_workflow_id: String::new(),
handler_workflow_id_conflict_policy: 0,
wait_for_signal: false,
variant: Some(execute_nexus_operation::Variant::Sync(SyncCall {
operation: String::new(),
input: val.clone(),
expected_output: val,
})),
})
}
}
Expand Down
38 changes: 25 additions & 13 deletions loadgen/kitchen_sink_executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -868,8 +868,9 @@ func TestKitchenSink(t *testing.T) {
&Action{
Variant: &Action_NexusOperation{
NexusOperation: &ExecuteNexusOperation{
Operation: "echo-sync",
Input: "hello",
Variant: &ExecuteNexusOperation_Sync{
Sync: &SyncCall{Input: "hello"},
},
AwaitableChoice: &AwaitableChoice{
Condition: &AwaitableChoice_WaitFinish{
WaitFinish: &emptypb.Empty{},
Expand All @@ -893,11 +894,16 @@ func TestKitchenSink(t *testing.T) {
&Action{
Variant: &Action_NexusOperation{
NexusOperation: &ExecuteNexusOperation{
Operation: "echo-async",
Input: "world",
BeforeActions: ListActionSet(
NewTimerAction(1),
),
Variant: &ExecuteNexusOperation_StartWorkflow{
StartWorkflow: &StartWorkflow{
WorkflowInput: &WorkflowInput{
InitialActions: ListActionSet(
NewTimerAction(1),
NewEmptyReturnResultAction(),
),
},
},
},
AwaitableChoice: &AwaitableChoice{
Condition: &AwaitableChoice_WaitFinish{
WaitFinish: &emptypb.Empty{},
Expand All @@ -922,10 +928,15 @@ func TestKitchenSink(t *testing.T) {
&Action{
Variant: &Action_NexusOperation{
NexusOperation: &ExecuteNexusOperation{
Operation: "echo-async",
BeforeActions: ListActionSet(
NewAwaitWorkflowStateAction("never", "resolves"),
),
Variant: &ExecuteNexusOperation_StartWorkflow{
StartWorkflow: &StartWorkflow{
WorkflowInput: &WorkflowInput{
InitialActions: ListActionSet(
NewAwaitWorkflowStateAction("never", "resolves"),
),
},
},
},
AwaitableChoice: &AwaitableChoice{
Condition: &AwaitableChoice_CancelAfterStarted{
CancelAfterStarted: &emptypb.Empty{},
Expand All @@ -951,8 +962,9 @@ func TestKitchenSink(t *testing.T) {
&Action{
Variant: &Action_NexusOperation{
NexusOperation: &ExecuteNexusOperation{
Operation: "echo-sync",
Input: "abandoned",
Variant: &ExecuteNexusOperation_Sync{
Sync: &SyncCall{Input: "abandoned"},
},
AwaitableChoice: &AwaitableChoice{
Condition: &AwaitableChoice_Abandon{
Abandon: &emptypb.Empty{},
Expand Down
Loading
Loading