remove immediate functions from esqueue worker cycles (elastic#65375)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
tsullivan · May 7, 2020 · 2e3010c · 2e3010c
1 parent 24be297
commit 2e3010c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 32 deletions.
diff --git a/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts b/x-pack/legacy/plugins/reporting/server/lib/create_worker.ts
@@ -11,18 +11,13 @@ import {
   ESQueueInstance,
   ESQueueWorkerExecuteFn,
   ExportTypeDefinition,
-  ImmediateExecuteFn,
-  JobDocPayload,
   JobSource,
   Logger,
-  RequestFacade,
 } from '../../types';
 // @ts-ignore untyped dependency
 import { events as esqueueEvents } from './esqueue';
 
 export function createWorkerFactory<JobParamsType>(reporting: ReportingCore, logger: Logger) {
-  type JobDocPayloadType = JobDocPayload<JobParamsType>;
-
   const config = reporting.getConfig();
   const queueConfig = config.get('queue');
   const kibanaName = config.kbnConfig.get('server', 'name');
@@ -31,48 +26,36 @@ export function createWorkerFactory<JobParamsType>(reporting: ReportingCore, log
   // Once more document types are added, this will need to be passed in
   return async function createWorker(queue: ESQueueInstance) {
     // export type / execute job map
-    const jobExecutors: Map<
-      string,
-      ImmediateExecuteFn<JobParamsType> | ESQueueWorkerExecuteFn<JobDocPayloadType>
-    > = new Map();
+    const jobExecutors: Map<string, ESQueueWorkerExecuteFn<unknown>> = new Map();
 
     for (const exportType of reporting.getExportTypesRegistry().getAll() as Array<
-      ExportTypeDefinition<
-        JobParamsType,
-        unknown,
-        unknown,
-        ImmediateExecuteFn<JobParamsType> | ESQueueWorkerExecuteFn<JobDocPayloadType>
-      >
+      ExportTypeDefinition<JobParamsType, unknown, unknown, ESQueueWorkerExecuteFn<unknown>>
     >) {
       const jobExecutor = await exportType.executeJobFactory(reporting, logger); // FIXME: does not "need" to be async
       jobExecutors.set(exportType.jobType, jobExecutor);
     }
 
-    const workerFn = (jobSource: JobSource<JobParamsType>, ...workerRestArgs: any[]) => {
+    const workerFn = <ScheduledTaskParamsType>(
+      jobSource: JobSource<ScheduledTaskParamsType>,
+      jobParams: ScheduledTaskParamsType,
+      cancellationToken: CancellationToken
+    ) => {
       const {
         _id: jobId,
         _source: { jobtype: jobType },
       } = jobSource;
 
+      if (!jobId) {
+        throw new Error(`Claimed job is missing an ID!: ${JSON.stringify(jobSource)}`);
+      }
+
       const jobTypeExecutor = jobExecutors.get(jobType);
-      // pass the work to the jobExecutor
       if (!jobTypeExecutor) {
         throw new Error(`Unable to find a job executor for the claimed job: [${jobId}]`);
       }
 
-      if (jobId) {
-        const jobExecutorWorker = jobTypeExecutor as ESQueueWorkerExecuteFn<JobDocPayloadType>;
-        return jobExecutorWorker(
-          jobId,
-          ...(workerRestArgs as [JobDocPayloadType, CancellationToken])
-        );
-      } else {
-        const jobExecutorImmediate = jobExecutors.get(jobType) as ImmediateExecuteFn<JobParamsType>;
-        return jobExecutorImmediate(
-          null,
-          ...(workerRestArgs as [JobDocPayload<JobParamsType>, RequestFacade])
-        );
-      }
+      // pass the work to the jobExecutor
+      return jobTypeExecutor(jobId, jobParams, cancellationToken);
     };
 
     const workerOptions = {

diff --git a/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts b/x-pack/legacy/plugins/reporting/server/lib/enqueue_job.ts
@@ -9,7 +9,6 @@ import {
   ConditionalHeaders,
   EnqueueJobFn,
   ESQueueCreateJobFn,
-  ImmediateCreateJobFn,
   Job,
   Logger,
   RequestFacade,
@@ -40,7 +39,7 @@ export function enqueueJobFactory(reporting: ReportingCore, parentLogger: Logger
     headers: ConditionalHeaders['headers'],
     request: RequestFacade
   ): Promise<Job> {
-    type CreateJobFn = ESQueueCreateJobFn<JobParamsType> | ImmediateCreateJobFn<JobParamsType>;
+    type CreateJobFn = ESQueueCreateJobFn<JobParamsType>;
 
     const esqueue = await reporting.getEsqueue();
     const exportType = reporting.getExportTypesRegistry().getById(exportTypeId);