fix(http): clear queues after hostrules change (#17563)

renovatebot · Sep 1, 2022 · 8ad1947 · 8ad1947
1 parent ab47364
commit 8ad1947
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/lib/modules/platform/github/index.spec.ts b/lib/modules/platform/github/index.spec.ts
@@ -22,6 +22,7 @@ const githubApiHost = 'https://api.github.com';
 jest.mock('delay');
 
 jest.mock('../../../util/host-rules');
+jest.mock('../../../util/http/queue');
 const hostRules: jest.Mocked<typeof _hostRules> = mocked(_hostRules);
 
 jest.mock('../../../util/git');

diff --git a/lib/util/http/queue.ts b/lib/util/http/queue.ts
@@ -1,12 +1,15 @@
 import PQueue from 'p-queue';
+import { logger } from '../../logger';
 import { parseUrl } from '../url';
 import { getRequestLimit } from './host-rules';
 
-const hostQueues = new Map<string | null, PQueue | null>();
+const hostQueues = new Map<string, PQueue | null>();
 
 export function getQueue(url: string): PQueue | null {
   const host = parseUrl(url)?.host;
   if (!host) {
+    // should never happen
+    logger.debug({ url }, 'No host');
     return null;
   }
 
@@ -15,7 +18,10 @@ export function getQueue(url: string): PQueue | null {
     queue = null; // null represents "no queue", as opposed to undefined
     const concurrency = getRequestLimit(url);
     if (concurrency) {
+      logger.debug({ concurrency, host }, 'Using queue');
       queue = new PQueue({ concurrency });
+    } else {
+      logger.debug({ host }, 'No concurency limits');
     }
   }
   hostQueues.set(host, queue);

diff --git a/lib/workers/global/index.ts b/lib/workers/global/index.ts
@@ -17,6 +17,7 @@ import { CONFIG_PRESETS_INVALID } from '../../constants/error-messages';
 import { pkg } from '../../expose.cjs';
 import { getProblems, logger, setMeta } from '../../logger';
 import * as hostRules from '../../util/host-rules';
+import * as queue from '../../util/http/queue';
 import * as repositoryWorker from '../repository';
 import { autodiscoverRepositories } from './autodiscover';
 import { parseConfigs } from './config/parse';
@@ -152,6 +153,10 @@ export async function start(): Promise<number> {
         repoConfig.hostRules.forEach((rule) => hostRules.add(rule));
         repoConfig.hostRules = [];
       }
+
+      // host rules can change concurrency
+      queue.clear();
+
       await repositoryWorker.renovateRepository(repoConfig);
       setMeta({});
     }

diff --git a/lib/workers/repository/init/merge.ts b/lib/workers/repository/init/merge.ts
@@ -21,6 +21,7 @@ import { getCache } from '../../../util/cache/repository';
 import { readLocalFile } from '../../../util/fs';
 import { getFileList } from '../../../util/git';
 import * as hostRules from '../../../util/host-rules';
+import * as queue from '../../../util/http/queue';
 import type { RepoFileConfig } from './types';
 
 async function detectConfigFile(): Promise<string | null> {
@@ -255,6 +256,8 @@ export async function mergeRenovateConfig(
         );
       }
     }
+    // host rules can change concurrency
+    queue.clear();
     delete resolvedConfig.hostRules;
   }
   returnConfig = mergeChildConfig(returnConfig, resolvedConfig);