Implement cache cleanup

bergundy · bergundy · commit a9a8751f07c1 · 2021-04-28T19:36:35.000+03:00
diff --git a/packages/test/src/test-worker-lifecycle.ts b/packages/test/src/test-worker-lifecycle.ts
@@ -3,6 +3,7 @@
  * Most tests use a mocked core, some tests run serially because they emit signals to the process
  */
 import test from 'ava';
+import Long from 'long';
 import { Worker } from '@temporalio/worker';
 import { sleep } from '@temporalio/worker/lib/utils';
 import { Worker as MockedWorker } from './mock-native-worker';
@@ -67,9 +68,23 @@ test('Mocked worker suspends and resumes', async (t) => {
   t.is(worker.getState(), 'RUNNING');
   worker.suspendPolling();
   t.is(worker.getState(), 'SUSPENDED');
+
+  const activation = {
+    runId: 'abc',
+    jobs: [
+      {
+        startWorkflow: {
+          workflowId: 'wfid',
+          arguments: [],
+          workflowType: 'not-found',
+          randomnessSeed: new Long(3),
+        },
+      },
+    ],
+  };
   // Worker finishes its polling before suspension
-  await worker.native.runWorkflowActivation({ runId: 'abc' });
-  const completion = worker.native.runWorkflowActivation({ runId: 'abc' });
+  await worker.native.runWorkflowActivation(activation);
+  const completion = worker.native.runWorkflowActivation(activation);
   await t.throwsAsync(
     Promise.race([
       sleep(10).then(() => {
diff --git a/packages/worker/native/src/lib.rs b/packages/worker/native/src/lib.rs
@@ -320,8 +320,7 @@ fn worker_new(mut cx: FunctionContext) -> JsResult<JsUndefined> {
         start_bridge_loop(
             CoreInitOptions {
                 gateway_opts,
-                // TODO: Fix evictions not being sent back to lang and set to true
-                evict_after_pending_cleared: false,
+                evict_after_pending_cleared: true,
                 max_outstanding_workflow_tasks,
                 max_outstanding_activities,
             },
diff --git a/packages/worker/src/worker.ts b/packages/worker/src/worker.ts
@@ -22,6 +22,7 @@ import { ActivityOptions } from '@temporalio/workflow';
 import { Info as ActivityInfo } from '@temporalio/activity';
 import { errorToUserCodeFailure } from '@temporalio/workflow/commonjs/common';
 import { tsToMs } from '@temporalio/workflow/commonjs/time';
+import { IllegalStateError } from '@temporalio/workflow/commonjs/errors';
 import {
   arrayFromPayloads,
   DataConverter,
@@ -599,8 +600,22 @@ export class Worker {
       mergeMap((group$) => {
         return group$.pipe(
           takeUntil(this.stateSubject.pipe(filter((value) => value === 'STOPPED'))),
-          mergeMapWithState(async (workflow: Workflow | undefined, task) => {
+          mergeMapWithState(async (workflow: Workflow | undefined, task): Promise<{
+            state: Workflow | undefined;
+            output: { arr?: Uint8Array; close: boolean };
+          }> => {
             const taskToken = formatTaskToken(task.taskToken);
+            const jobs = task.jobs.filter(({ removeFromCache }) => !removeFromCache);
+            // Found a removeFromCache job
+            const close = jobs.length < task.jobs.length;
+            task.jobs = jobs;
+            if (jobs.length === 0) {
+              if (!close) {
+                throw new IllegalStateError('Got a Workflow activation with no jobs');
+              }
+              return { state: undefined, output: { close, arr: undefined } };
+            }
+
             if (workflow === undefined) {
               try {
                 // Find a workflow start job in the activation jobs list
@@ -660,19 +675,15 @@ export class Worker {
               }
             }
 
-            const jobs = task.jobs.filter(({ removeFromCache }) => !removeFromCache);
-            // Found a removeFromCache job
-            const close = jobs.length < task.jobs.length;
-            task.jobs = jobs;
-
-            // TODO: single param
             const arr = await workflow.activate(task.taskToken, task);
+
             return { state: workflow, output: { close, arr } };
           }, undefined),
           tap(({ close }) => void close && group$.close())
         );
       }),
-      map(({ arr }) => arr)
+      map(({ arr }) => arr),
+      filter((arr): arr is Uint8Array => arr !== undefined)
     );
   }
 
diff --git a/packages/workflow/src/errors.ts b/packages/workflow/src/errors.ts
@@ -52,7 +52,9 @@ export class CancellationError extends Error {
   }
 }
 
-/// Used in different parts of the project to signal to the user that they've done something wrong
+/**
+ * Used in different parts of the project to signal that something unexpected has happened
+ */
 export class IllegalStateError extends Error {
   public readonly name: string = 'IllegalStateError';
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ export class CancellationError extends Error {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-/// Used in different parts of the project to signal to the user that they've done something wrong`
	`55`	`+/**`
	`56`	`+ * Used in different parts of the project to signal that something unexpected has happened`
	`57`	`+ */`
`56`	`58`	`export class IllegalStateError extends Error {`
`57`	`59`	`public readonly name: string = 'IllegalStateError';`
`58`	`60`	`}`