changelog.d/20240208_111236_regis_infinite_course_cache.md

@@ -1,4 +0,0 @@
-- 💥[Bugfix] Prevent infinite growth of course structure cache in Redis. (by @regisb)
-  - Redis is now configured with a maximum memory size of 4GB. If this is too low for your platform, you should increase this value using the new "redis-conf" patch.
-  - Make sure that course structure cache keys have an actual timeout.
-- [Feature] Introduce the "redis-conf" patch. (by @regisb)

docs/reference/patches.rst

@@ -376,13 +376,6 @@ File: ``apps/openedx/settings/lms/production.py``
 
 Python-formatted LMS settings in production. Values defined here override the values from :patch:`openedx-lms-common-settings`.
 
-``redis-conf``
-==============
-
-File: ``apps/redis/redis.conf``
-
-Implement this patch to override hard-coded Redis configuration values. See the `Redis configuration reference <https://redis.io/docs/management/config-file/>`__`.
-
 ``uwsgi-config``
 ================
 

requirements/dev.txt

@@ -42,7 +42,7 @@ click-log==0.4.0
     # via scriv
 coverage==7.3.2
     # via -r requirements/dev.in
-cryptography==42.0.3
+cryptography==41.0.7
     # via secretstorage
 dill==0.3.7
     # via pylint

tutor/templates/apps/openedx/settings/partials/common_all.py

@@ -73,7 +73,7 @@ CACHES = {
     },
     "course_structure_cache": {
         "KEY_PREFIX": "course_structure",
-        "TIMEOUT": 604800, # 1 week
+        "TIMEOUT": 7200,
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}",
     },

tutor/templates/apps/redis/redis.conf

@@ -39,10 +39,3 @@ auto-aof-rewrite-percentage 100
 auto-aof-rewrite-min-size 64mb
 aof-load-truncated yes
 aof-use-rdb-preamble yes
-
-############################## MEMORY MANAGEMENT ################################
-
-maxmemory 4gb
-maxmemory-policy allkeys-lru
-
-{{ patch("redis-conf") }}

tutor/templates/build/openedx/Dockerfile

@@ -51,9 +51,6 @@ RUN git config --global user.email "tutor@overhang.io" \
 {{ patch("openedx-dockerfile-git-patches-default") }}
 {%- else %}
 # Patch edx-platform
-# Prevent course structure cache infinite growth
-# https://github.com/openedx/edx-platform/pull/34210
-RUN curl -fsSL https://github.com/openedx/edx-platform/commit/ad201cd664b6c722cbefcbda23ae390c06daf621.patch | git am
 {%- endif %}
 
 {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/<GITSHA1>.patch | git am #}