temporalio 0.0.1 → 0.0.2

data/bridge/sdk-core/core/src/core_tests/activity_tasks.rs

@@ -10,6 +10,7 @@ use crate::{
     ActivityHeartbeat, Worker, WorkerConfigBuilder,
 };
 use futures::FutureExt;
+use itertools::Itertools;
 use std::{
     cell::RefCell,
     collections::{hash_map::Entry, HashMap, VecDeque},
@@ -23,7 +24,6 @@ use std::{
 use temporal_client::WorkflowOptions;
 use temporal_sdk::{ActivityOptions, WfContext};
 use temporal_sdk_core_api::{errors::CompleteActivityError, Worker as WorkerTrait};
-use temporal_sdk_core_protos::temporal::api::command::v1::ScheduleActivityTaskCommandAttributes;
 use temporal_sdk_core_protos::{
     coresdk::{
         activity_result::{
@@ -40,7 +40,7 @@ use temporal_sdk_core_protos::{
         ActivityTaskCompletion,
     },
     temporal::api::{
-        command::v1::command::Attributes,
+        command::v1::{command::Attributes, ScheduleActivityTaskCommandAttributes},
         enums::v1::EventType,
         workflowservice::v1::{
             PollActivityTaskQueueResponse, RecordActivityTaskHeartbeatResponse,
@@ -437,7 +437,7 @@ async fn many_concurrent_heartbeat_cancels() {
 #[tokio::test]
 async fn activity_timeout_no_double_resolve() {
     let t = canned_histories::activity_double_resolve_repro();
-    let core = build_fake_worker("fake_wf_id", t, &[3]);
+    let core = build_fake_worker("fake_wf_id", t, [3]);
     let activity_id = 1;
 
     poll_and_reply(
@@ -613,24 +613,105 @@ async fn max_tq_acts_set_passed_to_poll_properly() {
     worker.poll_activity_task().await.unwrap();
 }
 
+/// This test doesn't test the real worker config since [mock_worker] bypasses the worker
+/// constructor, [mock_worker] will not pass an activity poller to the worker when
+/// `no_remote_activities` is set to `true`.
+#[tokio::test]
+async fn no_eager_activities_requested_when_worker_options_disable_remote_activities() {
+    let wfid = "fake_wf_id";
+    let mut t = TestHistoryBuilder::default();
+    t.add_by_type(EventType::WorkflowExecutionStarted);
+    t.add_full_wf_task();
+    let scheduled_event_id = t.add_activity_task_scheduled("act_id");
+    let started_event_id = t.add_activity_task_started(scheduled_event_id);
+    t.add_activity_task_completed(scheduled_event_id, started_event_id, b"hi".into());
+    t.add_full_wf_task();
+    t.add_workflow_execution_completed();
+    let num_eager_requested = Arc::new(AtomicUsize::new(0));
+    // Clone it to move into the callback below
+    let num_eager_requested_clone = num_eager_requested.clone();
+
+    let mut mock = mock_workflow_client();
+    mock.expect_complete_workflow_task()
+        .times(1)
+        .returning(move |req| {
+            // Store the number of eager activities requested to be checked below
+            let count = req
+                .commands
+                .into_iter()
+                .filter(|c| match c.attributes {
+                    Some(Attributes::ScheduleActivityTaskCommandAttributes(
+                        ScheduleActivityTaskCommandAttributes {
+                            request_eager_execution,
+                            ..
+                        },
+                    )) => request_eager_execution,
+                    _ => false,
+                })
+                .count();
+            num_eager_requested_clone.store(count, Ordering::Relaxed);
+            Ok(RespondWorkflowTaskCompletedResponse {
+                workflow_task: None,
+                activity_tasks: vec![],
+                reset_history_event_id: 0,
+            })
+        });
+    let mut mock = single_hist_mock_sg(wfid, t, [1], mock, true);
+    let mut mock_poller = mock_manual_poller();
+    mock_poller
+        .expect_poll()
+        .returning(|| futures::future::pending().boxed());
+    mock.set_act_poller(Box::new(mock_poller));
+    mock.worker_cfg(|wc| {
+        wc.max_cached_workflows = 2;
+        wc.no_remote_activities = true;
+    });
+    let core = mock_worker(mock);
+
+    // Test start
+    let wf_task = core.poll_workflow_activation().await.unwrap();
+    let cmds = vec![ScheduleActivity {
+        seq: 1,
+        activity_id: "act_id".to_string(),
+        task_queue: TEST_Q.to_string(),
+        cancellation_type: ActivityCancellationType::TryCancel as i32,
+        ..Default::default()
+    }
+    .into()];
+
+    core.complete_workflow_activation(WorkflowActivationCompletion::from_cmds(
+        wf_task.run_id,
+        cmds,
+    ))
+    .await
+    .unwrap();
+
+    core.shutdown().await;
+
+    assert_eq!(num_eager_requested.load(Ordering::Relaxed), 0);
+}
+
 /// This test verifies that activity tasks which come as replies to completing a WFT are properly
 /// delivered via polling.
 #[tokio::test]
 async fn activity_tasks_from_completion_are_delivered() {
+    // Construct the history - one task with 5 activities, 4 on the same task queue, and 1 on a
+    // different queue, 3 activities will be executed eagerly as specified by the
+    // MAX_EAGER_ACTIVITY_RESERVATIONS_PER_WORKFLOW_TASK constant.
     let wfid = "fake_wf_id";
     let mut t = TestHistoryBuilder::default();
     t.add_by_type(EventType::WorkflowExecutionStarted);
     t.add_full_wf_task();
-    let act_same_queue_sched_id = t.add_activity_task_scheduled("act_id_same_queue");
-    let act_different_queue_sched_id = t.add_activity_task_scheduled("act_id_different_queue");
-    let act_same_queue_start_id = t.add_activity_task_started(act_same_queue_sched_id);
-    t.add_activity_task_completed(
-        act_same_queue_sched_id,
-        act_same_queue_start_id,
-        b"hi".into(),
-    );
+    let act_same_queue_scheduled_ids = (1..4)
+        .map(|i| t.add_activity_task_scheduled(format!("act_id_{}_same_queue", i)))
+        .collect_vec();
+    t.add_activity_task_scheduled("act_id_same_queue_not_eager");
+    t.add_activity_task_scheduled("act_id_different_queue");
+    for scheduled_event_id in act_same_queue_scheduled_ids {
+        let started_event_id = t.add_activity_task_started(scheduled_event_id);
+        t.add_activity_task_completed(scheduled_event_id, started_event_id, b"hi".into());
+    }
     t.add_full_wf_task();
-    t.add_activity_task_cancel_requested(act_different_queue_sched_id);
     t.add_workflow_execution_completed();
 
     let num_eager_requested = Arc::new(AtomicUsize::new(0));
@@ -658,15 +739,18 @@ async fn activity_tasks_from_completion_are_delivered() {
             num_eager_requested_clone.store(count, Ordering::Relaxed);
             Ok(RespondWorkflowTaskCompletedResponse {
                 workflow_task: None,
-                activity_tasks: vec![PollActivityTaskQueueResponse {
-                    task_token: vec![1],
-                    activity_id: "act_id_same_queue".to_string(),
-                    ..Default::default()
-                }],
+                activity_tasks: (1..4)
+                    .map(|i| PollActivityTaskQueueResponse {
+                        task_token: vec![i],
+                        activity_id: format!("act_id_{}_same_queue", i),
+                        ..Default::default()
+                    })
+                    .collect_vec(),
+                reset_history_event_id: 0,
             })
         });
     mock.expect_complete_activity_task()
-        .times(1)
+        .times(3)
         .returning(|_, _| Ok(RespondActivityTaskCompletedResponse::default()));
     let mut mock = single_hist_mock_sg(wfid, t, [1], mock, true);
     let mut mock_poller = mock_manual_poller();
@@ -677,46 +761,65 @@ async fn activity_tasks_from_completion_are_delivered() {
     mock.worker_cfg(|wc| wc.max_cached_workflows = 2);
     let core = mock_worker(mock);
 
+    // Test start
     let wf_task = core.poll_workflow_activation().await.unwrap();
-    core.complete_workflow_activation(WorkflowActivationCompletion::from_cmds(
-        wf_task.run_id,
-        vec![
+    let mut cmds = (1..4)
+        .map(|seq| {
             ScheduleActivity {
-                seq: 1,
-                activity_id: "act_id_same_queue".to_string(),
+                seq,
+                activity_id: format!("act_id_{}_same_queue", seq),
                 task_queue: TEST_Q.to_string(),
                 cancellation_type: ActivityCancellationType::TryCancel as i32,
                 ..Default::default()
             }
-            .into(),
-            ScheduleActivity {
-                seq: 2,
-                activity_id: "act_id_different_queue".to_string(),
-                task_queue: "different_queue".to_string(),
-                cancellation_type: ActivityCancellationType::Abandon as i32,
-                ..Default::default()
-            }
-            .into(),
-        ],
+            .into()
+        })
+        .collect_vec();
+    cmds.push(
+        ScheduleActivity {
+            seq: 4,
+            activity_id: "act_id_same_queue_not_eager".to_string(),
+            task_queue: TEST_Q.to_string(),
+            cancellation_type: ActivityCancellationType::TryCancel as i32,
+            ..Default::default()
+        }
+        .into(),
+    );
+    cmds.push(
+        ScheduleActivity {
+            seq: 5,
+            activity_id: "act_id_different_queue".to_string(),
+            task_queue: "different_queue".to_string(),
+            cancellation_type: ActivityCancellationType::Abandon as i32,
+            ..Default::default()
+        }
+        .into(),
+    );
+
+    core.complete_workflow_activation(WorkflowActivationCompletion::from_cmds(
+        wf_task.run_id,
+        cmds,
     ))
     .await
     .unwrap();
 
-    // We should see the activity when we poll now
-    let act_task = core.poll_activity_task().await.unwrap();
-    assert_eq!(act_task.task_token, vec![1]);
+    // We should see the 3 eager activities when we poll now
+    for i in 1..4 {
+        let act_task = core.poll_activity_task().await.unwrap();
+        assert_eq!(act_task.task_token, vec![i]);
 
-    core.complete_activity_task(ActivityTaskCompletion {
-        task_token: act_task.task_token.clone(),
-        result: Some(ActivityExecutionResult::ok("hi".into())),
-    })
-    .await
-    .unwrap();
+        core.complete_activity_task(ActivityTaskCompletion {
+            task_token: act_task.task_token.clone(),
+            result: Some(ActivityExecutionResult::ok("hi".into())),
+        })
+        .await
+        .unwrap();
+    }
 
     core.shutdown().await;
 
     // Verify only a single eager activity was scheduled (the one on our worker's task queue)
-    assert_eq!(num_eager_requested.load(Ordering::Relaxed), 1);
+    assert_eq!(num_eager_requested.load(Ordering::Relaxed), 3);
 }
 
 #[tokio::test]