Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit d24b947

Browse files
committed
Remove warning
1 parent 5b97e4e commit d24b947

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

scripts-dev/complement.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,6 @@ if [[ -n "$WORKERS" ]]; then
209209
# Workers can only use Postgres as a database.
210210
export PASS_SYNAPSE_COMPLEMENT_DATABASE=postgres
211211

212-
# Allow testing Faster Remote Room Joins despite the feature being incomplete.
213-
# Do not use in production, not even temporarily! No support will be provided!
214-
export PASS_SYNAPSE_DANGEROUS_EXPERIMENTAL_I_DO_NOT_CARE_ABOUT_THIS_SERVER_ENABLE_FRRJ_UNDER_WORKERS_ANYWAY=1
215-
216212
# And provide some more configuration to complement.
217213

218214
# It can take quite a while to spin up a worker-mode Synapse for the first

synapse/app/generic_worker.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
import logging
16-
import os
1716
import sys
1817
from typing import Dict, List
1918

@@ -283,30 +282,6 @@ def start(config_options: List[str]) -> None:
283282
"synapse.app.user_dir",
284283
)
285284

286-
if config.experimental.faster_joins_enabled:
287-
# Never enable this flag on a server that is not ephemeral, and especially
288-
# not on a production server! Not even temporarily!
289-
# THIS FLAG IS PROVIDED SOLELY FOR COMPLEMENT TEST COVERAGE TO PREVENT TEST
290-
# REGRESSIONS WHILST FASTER JOINS ARE IN DEVELOPMENT.
291-
# NO SUPPORT WILL BE PROVIDED ONCE THIS OPTION HAS BEEN ENABLED ON A SERVER.
292-
if os.environb.get(
293-
b"SYNAPSE_DANGEROUS_EXPERIMENTAL_I_DO_NOT_CARE_ABOUT_THIS_SERVER_ENABLE_FRRJ_UNDER_WORKERS_ANYWAY"
294-
):
295-
logger.critical(
296-
"You have enabled the experimental `faster_joins` config option. "
297-
"It is not currently compatible with worker deployments. "
298-
"You have chosen to enable it anyway. "
299-
"Expect severe bugs, including irreversible database corruption "
300-
"and permanent data loss. "
301-
"No support will be offered for this installation of Synapse."
302-
)
303-
else:
304-
raise ConfigError(
305-
"You have enabled the experimental `faster_joins` config option, but "
306-
"it is not compatible with worker deployments yet. Please disable "
307-
"`faster_joins` or run Synapse as a single process deployment instead."
308-
)
309-
310285
synapse.events.USE_FROZEN_DICTS = config.server.use_frozen_dicts
311286
synapse.util.caches.TRACK_MEMORY_USAGE = config.caches.track_memory_usage
312287

0 commit comments

Comments
 (0)