diff --git a/lib/config/presets/common.ts b/lib/config/presets/common.ts index 4fb427a4a3cfe9d0aa68138c1efab6874758087f..d79e996f3a8241a5ee6e2cefae05f55f3fcb0af6 100644 --- a/lib/config/presets/common.ts +++ b/lib/config/presets/common.ts @@ -42,6 +42,7 @@ export const removedPresets: Record<string, string | null> = { 'customManagers:helmChartYamlAppVersions', 'regexManagers:mavenPropertyVersions': 'customManagers:mavenPropertyVersions', 'regexManagers:tfvarsVersions': 'customManagers:tfvarsVersions', + 'workarounds:reduceRepologyServerLoad': null, }; const renamedMonorepos: Record<string, string> = { diff --git a/lib/config/presets/internal/workarounds.ts b/lib/config/presets/internal/workarounds.ts index 815d864ec649a136d8f55ad3c1d61292b73ff72b..53ef59c34a1add2d2a733282986c53b56c85e8f3 100644 --- a/lib/config/presets/internal/workarounds.ts +++ b/lib/config/presets/internal/workarounds.ts @@ -14,7 +14,6 @@ export const presets: Record<string, Preset> = { 'workarounds:ignoreHttp4sDigestMilestones', 'workarounds:typesNodeVersioning', 'workarounds:nodeDockerVersioning', - 'workarounds:reduceRepologyServerLoad', 'workarounds:doNotUpgradeFromAlpineStableToEdge', 'workarounds:supportRedHatImageVersion', 'workarounds:javaLTSVersions', @@ -201,17 +200,6 @@ export const presets: Record<string, Preset> = { }, ], }, - reduceRepologyServerLoad: { - description: - 'Limit requests to reduce load on Repology servers until we can fix this properly, see issue `#10133`.', - hostRules: [ - { - concurrentRequestLimit: 1, - matchHost: 'repology.org', - maxRequestsPerSecond: 0.5, - }, - ], - }, supportRedHatImageVersion: { description: 'Use specific versioning for Red Hat-maintained container images.', diff --git a/lib/util/http/rate-limits.ts b/lib/util/http/rate-limits.ts index 03554db352e6ca85b66485776d8e10c10f5786c2..c6105379a1c60b509363fda59ee25abeed708d4a 100644 --- a/lib/util/http/rate-limits.ts +++ b/lib/util/http/rate-limits.ts @@ -9,6 +9,10 @@ const concurrencyDefaults: ConcurrencyLimitRule[] = [ matchHost: 'registry.npmjs.org', concurrency: 999, }, + { + matchHost: 'repology.org', + concurrency: 1, + }, { matchHost: '*', concurrency: 16, @@ -35,6 +39,10 @@ const throttleDefaults: ThrottleLimitRule[] = [ matchHost: 'https://plugins.gradle.org', throttleMs: 50, }, + { + matchHost: 'repology.org', + throttleMs: 2000, + }, ]; let throttleLimits: ThrottleLimitRule[] = [];