From 357139d67c476d7dbe28413870c21fb8ff6f1190 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Fri, 31 Jul 2020 14:55:29 -0400
Subject: [PATCH] [Ingest Manager] Fix limited concurrency helper (#73976)

---
 .../ingest_manager/server/routes/limited_concurrency.test.ts  | 2 +-
 .../ingest_manager/server/routes/limited_concurrency.ts       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.test.ts b/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.test.ts
index f84f417ce402d..e5b5a83743287 100644
--- a/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.test.ts
@@ -39,7 +39,7 @@ describe('registerLimitedConcurrencyRoutes', () => {
 });
 
 // assertions for calls to .decrease are commented out because it's called on the
-// "req.events.aborted$ observable (which) will never emit from a mocked request in a jest unit test environment"
+// "req.events.completed$ observable (which) will never emit from a mocked request in a jest unit test environment"
 // https://github.com/elastic/kibana/pull/72338#issuecomment-661908791
 describe('preAuthHandler', () => {
   test(`ignores routes when !isMatch`, async () => {
diff --git a/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.ts b/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.ts
index 11fdc944e031d..7ba8e151b726c 100644
--- a/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/limited_concurrency.ts
@@ -66,9 +66,7 @@ export function createLimitedPreAuthHandler({
 
     maxCounter.increase();
 
-    // requests.events.aborted$ has a bug (but has test which explicitly verifies) where it's fired even when the request completes
-    // https://github.com/elastic/kibana/pull/70495#issuecomment-656288766
-    request.events.aborted$.toPromise().then(() => {
+    request.events.completed$.toPromise().then(() => {
       maxCounter.decrease();
     });