Fix a handful of integ test problems or sensititivy to new server

Author: Sushisource

core-api/src/worker.rs

@@ -190,6 +190,19 @@ impl WorkerConfigBuilder {
                 );
             }
         }
+
+        let max_wft_polls = self
+            .max_concurrent_wft_polls
+            .unwrap_or(MAX_CONCURRENT_WFT_POLLS_DEFAULT);
+
+        if let Some(max_cache) = self.max_cached_workflows {
+            if max_cache > 0 && max_wft_polls > max_cache {
+                return Err(
+                    "`max_concurrent_wft_polls` cannot exceed `max_cached_workflows`".to_owned(),
+                );
+            }
+        }
+
         // if matches!(self.max_concurrent_wft_polls, Some(1))
         //     && self.max_cached_workflows > Some(0)
         //     && self

core/src/worker/mod.rs

@@ -267,7 +267,9 @@ impl Worker {
             config.workflow_task_slot_supplier.clone(),
             metrics.with_new_attrs([workflow_worker_type()]),
             if config.max_cached_workflows > 0 {
-                Some(config.max_cached_workflows)
+                // Since we always need to be able to poll the normal task queue as well as the
+                // sticky queue, we need a value of at least 2 here.
+                Some(std::cmp::max(2, config.max_cached_workflows))
             } else {
                 None
             },

tests/integ_tests/polling_tests.rs

@@ -1,9 +1,9 @@
 use assert_matches::assert_matches;
-use std::sync::Arc;
-use std::time::Duration;
+use std::{sync::Arc, time::Duration};
 use temporal_client::{WfClientExt, WorkflowClientTrait, WorkflowOptions};
-use temporal_sdk_core::ephemeral_server::TemporalDevServerConfigBuilder;
-use temporal_sdk_core::{init_worker, ClientOptionsBuilder, WorkerConfigBuilder};
+use temporal_sdk_core::{
+    ephemeral_server::TemporalDevServerConfigBuilder, init_worker, ClientOptionsBuilder,
+};
 use temporal_sdk_core_api::Worker;
 use temporal_sdk_core_protos::coresdk::{
     activity_task::activity_task as act_task,
@@ -14,7 +14,7 @@ use temporal_sdk_core_protos::coresdk::{
 };
 use temporal_sdk_core_test_utils::{
     default_cached_download, drain_pollers_and_shutdown, init_core_and_create_wf, init_integ_telem,
-    schedule_activity_cmd, WorkerTestHelpers,
+    integ_worker_config, schedule_activity_cmd, WorkerTestHelpers,
 };
 use tokio::time::timeout;
 use tracing::info;
@@ -165,10 +165,7 @@ async fn switching_worker_client_changes_poll() {
     // Create a worker only on the first server
     let worker = init_worker(
         init_integ_telem(),
-        WorkerConfigBuilder::default()
-            .namespace("default")
-            .task_queue("my-task-queue")
-            .worker_build_id("test_build_id")
+        integ_worker_config("my-task-queue")
             // We want a cache so we don't get extra remove-job activations
             .max_cached_workflows(100_usize)
             .build()

tests/integ_tests/update_tests.rs

@@ -664,7 +664,7 @@ async fn update_timer_sequence() {
                 Ok("done")
             },
         );
-        ctx.timer(Duration::from_secs(1)).await;
+        ctx.timer(Duration::from_secs(2)).await;
         Ok(().into())
     });
 

tests/integ_tests/visibility_tests.rs

@@ -97,7 +97,7 @@ async fn client_create_namespace() {
     );
 
     let register_options = RegisterNamespaceOptions::builder()
-        .namespace("test-create-namespace")
+        .namespace(uuid::Uuid::new_v4().to_string())
         .description("it's alive")
         .build()
         .unwrap();

tests/integ_tests/workflow_tests.rs

@@ -126,6 +126,7 @@ pub(crate) async fn cache_evictions_wf(command_sink: WfContext) -> WorkflowResul
 async fn workflow_lru_cache_evictions() {
     let wf_type = "workflow_lru_cache_evictions";
     let mut starter = CoreWfStarter::new(wf_type);
+    starter.worker_config.max_concurrent_wft_polls(1_usize);
     starter.no_remote_activities().max_cached_workflows(1);
     let mut worker = starter.worker().await;
     worker.register_wf(wf_type.to_string(), cache_evictions_wf);