From b667cef262dd0d5f7bb8ed3a7641c2c3f485816b Mon Sep 17 00:00:00 2001 From: Antoine Clausse Date: Wed, 21 May 2025 13:49:15 +0200 Subject: [PATCH] Revert "Update defaultHighWaterMark to 64KiB (Node 22's default) (#25522)" (#25789) This reverts commit 19d731abf683066654027de3a4f9ac0b8916f22c. GitOrigin-RevId: eb7c45ab45e02054601b607a4bfeb432424a1837 --- services/chat/config/settings.defaults.cjs | 3 --- services/clsi/config/settings.defaults.js | 4 ---- services/contacts/config/settings.defaults.cjs | 3 --- services/docstore/config/settings.defaults.js | 4 ---- services/document-updater/config/settings.defaults.js | 3 --- services/filestore/config/settings.defaults.js | 4 ---- services/notifications/config/settings.defaults.js | 5 ----- services/project-history/config/settings.defaults.cjs | 3 --- services/real-time/config/settings.defaults.js | 4 ---- services/web/config/settings.defaults.js | 4 ---- 10 files changed, 37 deletions(-) diff --git a/services/chat/config/settings.defaults.cjs b/services/chat/config/settings.defaults.cjs index 9cc27a6877..4b7dc293a9 100644 --- a/services/chat/config/settings.defaults.cjs +++ b/services/chat/config/settings.defaults.cjs @@ -1,9 +1,6 @@ const http = require('node:http') const https = require('node:https') -const stream = require('node:stream') -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) http.globalAgent.keepAlive = false https.globalAgent.keepAlive = false diff --git a/services/clsi/config/settings.defaults.js b/services/clsi/config/settings.defaults.js index 35783eb5b0..d187fe273e 100644 --- a/services/clsi/config/settings.defaults.js +++ b/services/clsi/config/settings.defaults.js @@ -1,9 +1,5 @@ const Path = require('node:path') const os = require('node:os') -const stream = require('node:stream') - -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) const isPreEmptible = process.env.PREEMPTIBLE === 'TRUE' const CLSI_SERVER_ID = os.hostname().replace('-ctr', '') diff --git a/services/contacts/config/settings.defaults.cjs b/services/contacts/config/settings.defaults.cjs index bcf014ee70..7ffdb83ce5 100644 --- a/services/contacts/config/settings.defaults.cjs +++ b/services/contacts/config/settings.defaults.cjs @@ -1,9 +1,6 @@ const http = require('node:http') const https = require('node:https') -const stream = require('node:stream') -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) http.globalAgent.maxSockets = 300 http.globalAgent.keepAlive = false https.globalAgent.keepAlive = false diff --git a/services/docstore/config/settings.defaults.js b/services/docstore/config/settings.defaults.js index 14da21e132..9ad506a9bd 100644 --- a/services/docstore/config/settings.defaults.js +++ b/services/docstore/config/settings.defaults.js @@ -1,9 +1,5 @@ const http = require('node:http') const https = require('node:https') -const stream = require('node:stream') - -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) http.globalAgent.maxSockets = 300 http.globalAgent.keepAlive = false diff --git a/services/document-updater/config/settings.defaults.js b/services/document-updater/config/settings.defaults.js index a6a1c397fa..0cd29d325b 100755 --- a/services/document-updater/config/settings.defaults.js +++ b/services/document-updater/config/settings.defaults.js @@ -1,9 +1,6 @@ const http = require('node:http') const https = require('node:https') -const stream = require('node:stream') -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) http.globalAgent.keepAlive = false https.globalAgent.keepAlive = false diff --git a/services/filestore/config/settings.defaults.js b/services/filestore/config/settings.defaults.js index 28d7190376..9a08bb197e 100644 --- a/services/filestore/config/settings.defaults.js +++ b/services/filestore/config/settings.defaults.js @@ -1,8 +1,4 @@ const Path = require('node:path') -const stream = require('node:stream') - -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) // environment variables renamed for consistency // use AWS_ACCESS_KEY_ID-style going forward diff --git a/services/notifications/config/settings.defaults.js b/services/notifications/config/settings.defaults.js index 26a3b79c6b..3453b88bd6 100644 --- a/services/notifications/config/settings.defaults.js +++ b/services/notifications/config/settings.defaults.js @@ -1,8 +1,3 @@ -const stream = require('node:stream') - -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) - module.exports = { internal: { notifications: { diff --git a/services/project-history/config/settings.defaults.cjs b/services/project-history/config/settings.defaults.cjs index ce92fc1cf2..9e5a39868a 100644 --- a/services/project-history/config/settings.defaults.cjs +++ b/services/project-history/config/settings.defaults.cjs @@ -1,9 +1,6 @@ const http = require('node:http') const https = require('node:https') -const stream = require('node:stream') -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) http.globalAgent.keepAlive = false https.globalAgent.keepAlive = false diff --git a/services/real-time/config/settings.defaults.js b/services/real-time/config/settings.defaults.js index 652fdae56a..57b0a50a42 100644 --- a/services/real-time/config/settings.defaults.js +++ b/services/real-time/config/settings.defaults.js @@ -1,10 +1,6 @@ /* eslint-disable camelcase */ const http = require('node:http') const https = require('node:https') -const stream = require('node:stream') - -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) http.globalAgent.keepAlive = false https.globalAgent.keepAlive = false diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 9faeace655..a7ff970ef0 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -1,10 +1,6 @@ const Path = require('node:path') -const stream = require('node:stream') const { merge } = require('@overleaf/settings/merge') -// TODO(24011): remove this after node 22 update -stream.setDefaultHighWaterMark(false, 64 * 1024) - let defaultFeatures, siteUrl // Make time interval config easier.