[Code] Enforce progress update at the end of the index job (#43381) (#…

…43474)
elastic · Aug 17, 2019 · 4d89981 · 4d89981
1 parent e18eca6
commit 4d89981
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/x-pack/legacy/plugins/code/server/indexer/abstract_indexer.ts b/x-pack/legacy/plugins/code/server/indexer/abstract_indexer.ts
@@ -105,7 +105,11 @@ export abstract class AbstractIndexer implements Indexer {
           percentage: Math.floor((100 * (successCount + failCount)) / totalCount),
           checkpoint: req,
         };
-        if (moment().diff(prevTimestamp) > this.INDEXER_PROGRESS_UPDATE_INTERVAL_MS) {
+        if (
+          moment().diff(prevTimestamp) > this.INDEXER_PROGRESS_UPDATE_INTERVAL_MS ||
+          // Ensure that the progress reporter always executed at the end of the job.
+          successCount + failCount === totalCount
+        ) {
           progressReporter(progress);
           prevTimestamp = moment();
         }

diff --git a/x-pack/legacy/plugins/code/server/queue/clone_worker.ts b/x-pack/legacy/plugins/code/server/queue/clone_worker.ts
@@ -74,7 +74,7 @@ export class CloneWorker extends AbstractGitWorker {
     const repo = RepositoryUtils.buildRepository(url);
 
     // Try to cancel any existing clone job for this repository.
-    this.cancellationService.cancelCloneJob(repo.uri, CancellationReason.NEW_JOB_OVERRIDEN);
+    await this.cancellationService.cancelCloneJob(repo.uri, CancellationReason.NEW_JOB_OVERRIDEN);
 
     let cancelled = false;
     let cancelledReason;

diff --git a/x-pack/legacy/plugins/code/server/queue/index_worker.ts b/x-pack/legacy/plugins/code/server/queue/index_worker.ts
@@ -84,7 +84,7 @@ export class IndexWorker extends AbstractWorker {
 
     // Binding the index cancellation logic
     let cancelled = false;
-    this.cancellationService.cancelIndexJob(uri, CancellationReason.NEW_JOB_OVERRIDEN);
+    await this.cancellationService.cancelIndexJob(uri, CancellationReason.NEW_JOB_OVERRIDEN);
     const indexPromises: Array<Promise<IndexStats>> = this.indexerFactories.map(
       async (indexerFactory: IndexerFactory, index: number) => {
         const indexer = await indexerFactory.create(uri, revision, enforceReindex);

diff --git a/x-pack/legacy/plugins/code/server/queue/update_worker.ts b/x-pack/legacy/plugins/code/server/queue/update_worker.ts
@@ -48,7 +48,7 @@ export class UpdateWorker extends AbstractGitWorker {
     );
 
     // Try to cancel any existing update job for this repository.
-    this.cancellationService.cancelUpdateJob(repo.uri, CancellationReason.NEW_JOB_OVERRIDEN);
+    await this.cancellationService.cancelUpdateJob(repo.uri, CancellationReason.NEW_JOB_OVERRIDEN);
 
     let cancelled = false;
     let cancelledReason;