diff --git a/Maintenance.md b/Maintenance.md index 5a21469d7..b8e771d57 100644 --- a/Maintenance.md +++ b/Maintenance.md @@ -133,10 +133,16 @@ You got the downtime message either through email or SMS. This is the order of o When the new redis server is connected to the primary redis server: # db-redis-story2 = moving to new server - # db-redis-story = old server about to be shutdown + # db-redis-story1 = old server about to be shutdown + # Edit digitalocean.tf to change db-redis-story count to 2 + make plan + make apply + make firewall + # Wait for redis to sync, takes 5-10 minutes + # Edit redis/consul_service.json to switch primary to db-redis-story2 make celery_stop make maintenance_on apd -l db-redis-story2 -t replicaofnoone - aps -l db-redis-story,db-redis-story2 -t consul + aps -l db-redis-story1,db-redis-story2 -t consul make maintenance_off make task diff --git a/ansible/roles/redis/tasks/main.yml b/ansible/roles/redis/tasks/main.yml index cbefac166..8ff302382 100644 --- a/ansible/roles/redis/tasks/main.yml +++ b/ansible/roles/redis/tasks/main.yml @@ -21,6 +21,13 @@ become: yes sysctl: name=vm.overcommit_memory value=1 state=present reload=yes +- name: Template redis.conf file + copy: + src: /srv/newsblur/docker/redis/redis.conf + dest: /srv/newsblur/docker/redis/redis.conf + notify: restart redis + register: updated_config + - name: Template redis_replica.conf file template: src: /srv/newsblur/docker/redis/redis_replica.conf.j2 @@ -40,7 +47,7 @@ become: yes docker_container: name: redis - image: redis:6.2.7 + image: redis:7 state: started command: /usr/local/etc/redis/redis_server.conf container_default_behavior: no_defaults diff --git a/ansible/roles/redis/templates/consul_service.json b/ansible/roles/redis/templates/consul_service.json index 13be47953..5ce8d327e 100644 --- a/ansible/roles/redis/templates/consul_service.json +++ b/ansible/roles/redis/templates/consul_service.json @@ -1,6 +1,6 @@ { "service": { - {% if inventory_hostname in ["db-redis-user", "db-redis-story1", "db-redis-session", "db-redis-pubsub"] %} + {% if inventory_hostname in ["db-redis-user", "db-redis-story2", "db-redis-session", "db-redis-pubsub"] %} "name": "{{ inventory_hostname|regex_replace('\d+', '') }}", {% else %} "name": "{{ inventory_hostname|regex_replace('\d+', '') }}-staging", diff --git a/apps/reader/views.py b/apps/reader/views.py index b87301644..b7530a5be 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -1404,7 +1404,12 @@ def load_river_stories__redis(request): user_search = None offset = (page-1) * limit story_date_order = "%sstory_date" % ('' if order == 'oldest' else '-') - + + if user.pk == 86178: + # Disable Michael_Novakhov account + logging.user(request, "~FCLoading ~FMMichael_Novakhov~SN's river, resource usage too high, ignoring.") + return HttpResponse("Resource usage too high", status=429) + if infrequent: feed_ids = Feed.low_volume_feeds(feed_ids, stories_per_month=infrequent) diff --git a/apps/rss_feeds/tasks.py b/apps/rss_feeds/tasks.py index dd1b8d506..d4a3c712c 100644 --- a/apps/rss_feeds/tasks.py +++ b/apps/rss_feeds/tasks.py @@ -52,6 +52,7 @@ def TaskFeeds(): r.zcard('tasked_feeds'), r.scard('queued_feeds'), r.zcard('scheduled_updates'))) + logging.debug(" ---> ~FBFeeds being tasked: ~SB%s" % feeds) @app.task(name='task-broken-feeds') def TaskBrokenFeeds(): diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py index 0e19a7bb0..f94a7de38 100644 --- a/apps/rss_feeds/views.py +++ b/apps/rss_feeds/views.py @@ -8,6 +8,7 @@ from django.views.decorators.http import condition from django.http import HttpResponseForbidden, HttpResponseRedirect, HttpResponse, Http404 from django.conf import settings from django.contrib.auth.decorators import login_required +from django.contrib.auth.models import User # from django.db import IntegrityError from apps.rss_feeds.models import Feed, merge_feeds from apps.rss_feeds.models import MFetchHistory @@ -510,19 +511,21 @@ def status(request): return HttpResponseForbidden() minutes = int(request.GET.get('minutes', 1)) now = datetime.datetime.now() + hour_ago = now + datetime.timedelta(minutes=minutes) username = request.GET.get('user', '') or request.GET.get('username', '') - if username: - user = User.objects.get(username=username) + if username == "all": + feeds = Feed.objects.filter(next_scheduled_update__lte=hour_ago).order_by('next_scheduled_update') else: - user = request.user - usersubs = UserSubscription.objects.filter(user=user) - feed_ids = usersubs.values('feed_id') - if minutes > 0: - hour_ago = now + datetime.timedelta(minutes=minutes) - feeds = Feed.objects.filter(pk__in=feed_ids, next_scheduled_update__lte=hour_ago).order_by('next_scheduled_update') - else: - hour_ago = now + datetime.timedelta(minutes=minutes) - feeds = Feed.objects.filter(pk__in=feed_ids, last_update__gte=hour_ago).order_by('-last_update') + if username: + user = User.objects.get(username=username) + else: + user = request.user + usersubs = UserSubscription.objects.filter(user=user) + feed_ids = usersubs.values('feed_id') + if minutes > 0: + feeds = Feed.objects.filter(pk__in=feed_ids, next_scheduled_update__lte=hour_ago).order_by('next_scheduled_update') + else: + feeds = Feed.objects.filter(pk__in=feed_ids, last_update__gte=hour_ago).order_by('-last_update') r = redis.Redis(connection_pool=settings.REDIS_FEED_UPDATE_POOL) queues = { diff --git a/apps/statistics/urls.py b/apps/statistics/urls.py index 0ba041ef8..ee2ede961 100644 --- a/apps/statistics/urls.py +++ b/apps/statistics/urls.py @@ -5,4 +5,5 @@ urlpatterns = [ url(r'^dashboard_graphs', views.dashboard_graphs, name='statistics-graphs'), url(r'^feedback_table', views.feedback_table, name='feedback-table'), url(r'^revenue', views.revenue, name='revenue'), + url(r'^slow', views.slow, name='slow'), ] diff --git a/apps/statistics/views.py b/apps/statistics/views.py index ca45fcfac..8d769c07a 100644 --- a/apps/statistics/views.py +++ b/apps/statistics/views.py @@ -1,12 +1,22 @@ +import base64 +import pickle +import redis import datetime +from operator import countOf +from collections import defaultdict from django.http import HttpResponse from django.shortcuts import render +from django.contrib.auth.decorators import login_required +from django.contrib.auth.models import AnonymousUser +from django.contrib.auth.models import User +from django.conf import settings from django.utils import feedgenerator +from django.http import HttpResponseForbidden from apps.statistics.models import MStatistics, MFeedback +from apps.statistics.rstats import round_time from apps.profile.models import PaymentHistory from utils import log as logging - def dashboard_graphs(request): statistics = MStatistics.all() return render( @@ -49,4 +59,60 @@ def revenue(request): request.META.get('HTTP_USER_AGENT', "")[:24] )) return HttpResponse(rss.writeString('utf-8'), content_type='application/rss+xml') - \ No newline at end of file + + +@login_required +def slow(request): + r = redis.Redis(connection_pool=settings.REDIS_STATISTICS_POOL) + if not request.user.is_staff and not settings.DEBUG: + logging.user(request, "~SKNON-STAFF VIEWING SLOW STATUS!") + assert False + return HttpResponseForbidden() + + now = datetime.datetime.now() + all_queries = {} + user_id_counts = {} + path_counts = {} + users = {} + + for minutes_ago in range(60*6): + dt_ago = now - datetime.timedelta(minutes=minutes_ago) + minute = round_time(dt_ago, round_to=60) + dt_ago_str = minute.strftime("%a %b %-d, %Y %H:%M") + name = f"SLOW:{minute.strftime('%s')}" + minute_queries = r.lrange(name, 0, -1) + for query_raw in minute_queries: + query = pickle.loads(base64.b64decode(query_raw)) + user_id = query['user_id'] + if dt_ago_str not in all_queries: + all_queries[dt_ago_str] = [] + if user_id in users: + user = users[user_id] + elif int(user_id) != 0: + try: + user = User.objects.get(pk=user_id) + except User.DoesNotExist: + continue + users[user_id] = user + else: + user = AnonymousUser() + users[user_id] = user + query['user'] = user + query['datetime'] = minute + all_queries[dt_ago_str].append(query) + if user_id not in user_id_counts: + user_id_counts[user_id] = 0 + user_id_counts[user_id] += 1 + if query['path'] not in path_counts: + path_counts[query['path']] = 0 + path_counts[query['path']] += 1 + + user_counts = [] + for user_id, count in user_id_counts.items(): + user_counts.append({'user': users[user_id], 'count': count}) + + return render(request, 'statistics/slow.xhtml', { + 'all_queries': all_queries, + 'user_counts': user_counts, + 'path_counts': path_counts, + }) diff --git a/clients/android/NewsBlur/build.gradle b/clients/android/NewsBlur/build.gradle index f18fb5bde..ccbdd791e 100644 --- a/clients/android/NewsBlur/build.gradle +++ b/clients/android/NewsBlur/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.6.21' repositories { mavenCentral() maven { @@ -9,9 +9,9 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40.1' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40.5' } } @@ -30,22 +30,22 @@ apply plugin: 'kotlin-kapt' apply plugin: 'dagger.hilt.android.plugin' dependencies { - implementation 'androidx.fragment:fragment-ktx:1.5.0' + implementation 'androidx.fragment:fragment-ktx:1.5.2' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.squareup.okhttp3:okhttp:4.9.2' - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.code.gson:gson:2.8.9' implementation 'com.android.billingclient:billing:4.0.0' implementation 'nl.dionsegijn:konfetti:1.2.2' implementation 'com.google.android.play:core:1.10.3' implementation "com.google.android.material:material:1.6.1" implementation "androidx.preference:preference-ktx:1.2.0" implementation "androidx.browser:browser:1.4.0" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.0" - implementation 'androidx.lifecycle:lifecycle-process:2.5.0' - implementation 'androidx.core:core-splashscreen:1.0.0-rc01' - implementation "com.google.dagger:hilt-android:2.40.1" - kapt "com.google.dagger:hilt-compiler:2.40.1" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1" + implementation 'androidx.lifecycle:lifecycle-process:2.5.1' + implementation 'androidx.core:core-splashscreen:1.0.0' + implementation "com.google.dagger:hilt-android:2.40.5" + kapt "com.google.dagger:hilt-compiler:2.40.5" } android { @@ -54,8 +54,8 @@ android { applicationId "com.newsblur" minSdkVersion 21 targetSdkVersion 31 - versionCode 204 - versionName "12.0" + versionCode 205 + versionName "12.0.1" } compileOptions.with { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/clients/android/NewsBlur/release/NewsBlur-release.aab b/clients/android/NewsBlur/release/NewsBlur-release.aab index 1dcebae06..65114852b 100644 Binary files a/clients/android/NewsBlur/release/NewsBlur-release.aab and b/clients/android/NewsBlur/release/NewsBlur-release.aab differ diff --git a/clients/android/NewsBlur/res/drawable/ic_add.xml b/clients/android/NewsBlur/res/drawable/ic_add.xml index 69b8757a3..0c523e7a1 100644 --- a/clients/android/NewsBlur/res/drawable/ic_add.xml +++ b/clients/android/NewsBlur/res/drawable/ic_add.xml @@ -1,6 +1,6 @@ + + diff --git a/clients/android/NewsBlur/res/drawable/shape_rounded_corners_4dp.xml b/clients/android/NewsBlur/res/drawable/shape_rounded_corners_4dp.xml new file mode 100644 index 000000000..470e121c4 --- /dev/null +++ b/clients/android/NewsBlur/res/drawable/shape_rounded_corners_4dp.xml @@ -0,0 +1,4 @@ + + + diff --git a/clients/android/NewsBlur/res/layout/view_widget_story_item.xml b/clients/android/NewsBlur/res/layout/view_widget_story_item.xml index 4020dae89..16331d04f 100644 --- a/clients/android/NewsBlur/res/layout/view_widget_story_item.xml +++ b/clients/android/NewsBlur/res/layout/view_widget_story_item.xml @@ -21,15 +21,14 @@ android:layout_height="match_parent" android:layout_toRightOf="@id/story_item_favicon_borderbar_1" /> - + android:layout_toRightOf="@+id/story_item_favicon_borderbar_2" /> = 1.1.1) or -# any combination. To enable only TLSv1.2 and TLSv1.3, use: +# By default, only TLSv1.2 and TLSv1.3 are enabled and it is highly recommended +# that older formally deprecated versions are kept disabled to reduce the attack surface. +# You can explicitly specify TLS versions to support. +# Allowed values are case insensitive and include "TLSv1", "TLSv1.1", "TLSv1.2", +# "TLSv1.3" (OpenSSL >= 1.1.1) or any combination. +# To enable only TLSv1.2 and TLSv1.3, use: # # tls-protocols "TLSv1.2 TLSv1.3" @@ -199,7 +284,7 @@ tcp-keepalive 300 # When choosing a cipher, use the server's preference instead of the client # preference. By default, the server follows the client's preference. -#66 +# # tls-prefer-server-ciphers yes # By default, TLS session caching is enabled to allow faster and less expensive @@ -222,6 +307,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. daemonize no # If you run Redis from upstart or systemd, Redis can interact with your @@ -230,11 +316,17 @@ daemonize no # supervised upstart - signal upstart by putting Redis into SIGSTOP mode # requires "expect stop" in your upstart job config # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET +# on startup, and updating Redis status on a regular +# basis. # supervised auto - detect upstart or systemd method based on # UPSTART_JOB or NOTIFY_SOCKET environment variables # Note: these supervision methods only signal "process is ready." # They do not enable continuous pings back to your supervisor. -supervised no +# +# The default is "no". To run under upstart/systemd, you can simply uncomment +# the line below: +# +# supervised auto # If a pid file is specified, Redis writes it where specified at startup # and removes it at exit. @@ -245,6 +337,9 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. +# +# Note that on modern Linux systems "/run/redis.pid" is more conforming +# and should be used instead. pidfile /var/run/redis_6379.pid # Specify the server verbosity level. @@ -270,44 +365,74 @@ logfile "" # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. # syslog-facility local0 +# To disable the built in crash log, which will possibly produce cleaner core +# dumps when they are needed, uncomment the following: +# +# crash-log-enabled no + +# To disable the fast memory check that's run as part of the crash log, which +# will possibly let redis terminate sooner, uncomment the following: +# +# crash-memcheck-enabled no + # Set the number of databases. The default database is DB 0, you can select # a different one on a per-connection basis using SELECT where # dbid is a number between 0 and 'databases'-1 databases 16 # By default Redis shows an ASCII art logo only when started to log to the -# standard output and if the standard output is a TTY. Basically this means -# that normally a logo is displayed only in interactive sessions. +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. # # However it is possible to force the pre-4.0 behavior and always show a # ASCII art logo in startup logs by setting the following option to yes. -always-show-logo yes +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" ################################ SNAPSHOTTING ################################ -# -# Save the DB on disk: -# -# save -# -# Will save the DB if both the given number of seconds and the given -# number of write operations against the DB occurred. -# -# In the example below the behavior will be to save: -# after 900 sec (15 min) if at least 1 key changed -# after 300 sec (5 min) if at least 10 keys changed -# after 60 sec if at least 10000 keys changed -# -# Note: you can disable saving completely by commenting out all "save" lines. -# -# It is also possible to remove all the previously configured save -# points by adding a save directive with a single empty string argument -# like in the following example: -# -# save "" -save 900 1 -save 300 10 -save 60 10000 +# Save the DB to disk. +# +# save [ ...] +# +# Redis will save the DB if the given number of seconds elapsed and it +# surpassed the given number of write operations against the DB. +# +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +# save "" +# +# Unless specified otherwise, by default Redis will save the DB: +# * After 3600 seconds (an hour) if at least 1 change was performed +# * After 300 seconds (5 minutes) if at least 100 changes were performed +# * After 60 seconds if at least 10000 changes were performed +# +# You can set these explicitly by uncommenting the following line. +# +# save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -339,6 +464,21 @@ rdbcompression yes # tell the loading code to skip the check. rdbchecksum yes +# Enables or disables full sanitization checks for ziplist and listpack etc when +# loading an RDB or RESTORE payload. This reduces the chances of a assertion or +# crash later on while processing commands. +# Options: +# no - Never perform full sanitization +# yes - Always perform full sanitization +# clients - Perform full sanitization only for user connections. +# Excludes: RDB files, RESTORE commands received from the master +# connection, and client connections which have the +# skip-sanitize-payload ACL flag. +# The default should be 'clients' but since it currently affects cluster +# resharding via MIGRATE, it is temporarily set to 'no' by default. +# +# sanitize-dump-payload no + # The filename where to dump the DB dbfilename dump.rdb @@ -413,9 +553,10 @@ dir ./ # still reply to client requests, possibly with out of date data, or the # data set may just be empty if this is the first synchronization. # -# 2) If replica-serve-stale-data is set to 'no' the replica will reply with -# an error "SYNC with master in progress" to all commands except: -# INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, # UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, # HOST and LATENCY. # @@ -464,7 +605,7 @@ replica-read-only yes # # With slow disks and fast (large bandwidth) networks, diskless replication # works better. -repl-diskless-sync no +repl-diskless-sync yes # When diskless replication is enabled, it is possible to configure the delay # the server waits in order to spawn the child that transfers the RDB via socket @@ -478,12 +619,18 @@ repl-diskless-sync no # it entirely just set it to 0 seconds and the transfer will start ASAP. repl-diskless-sync-delay 5 +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +repl-diskless-sync-max-replicas 0 + # ----------------------------------------------------------------------------- # WARNING: RDB diskless load is experimental. Since in this setup the replica # does not immediately store an RDB on disk, it may cause data loss during # failovers. RDB diskless load + Redis modules not handling I/O reads may also # cause Redis to abort in case of I/O errors during the initial synchronization -# stage with the master. Use only if your do what you are doing. +# stage with the master. Use only if you know what you are doing. # ----------------------------------------------------------------------------- # # Replica can load the RDB it reads from the replication link directly from the @@ -492,19 +639,23 @@ repl-diskless-sync-delay 5 # # In many cases the disk is slower than the network, and storing and loading # the RDB file may increase replication time (and even increase the master's -# Copy on Write memory and salve buffers). +# Copy on Write memory and replica buffers). # However, parsing the RDB file directly from the socket may mean that we have # to flush the contents of the current database before the full rdb was # received. For this reason we have the following options: # # "disabled" - Don't use diskless load (store the rdb file to the disk first) # "on-empty-db" - Use diskless load only when it is completely safe. -# "swapdb" - Keep a copy of the current db contents in RAM while parsing -# the data directly from the socket. note that this requires -# sufficient memory, if you don't have it, you risk an OOM kill. +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# data set while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. repl-diskless-load disabled -# Replicas send PINGs to server in a predefined interval. It's possible to +# Master send PINGs to its replicas in a predefined interval. It's possible to # change this interval with the repl_ping_replica_period option. The default # value is 10 seconds. # @@ -579,6 +730,43 @@ repl-disable-tcp-nodelay no # By default the priority is 100. replica-priority 100 +# The propagation error behavior controls how Redis will behave when it is +# unable to handle a command being processed in the replication stream from a master +# or processed while reading from an AOF file. Errors that occur during propagation +# are unexpected, and can cause data inconsistency. However, there are edge cases +# in earlier versions of Redis where it was possible for the server to replicate or persist +# commands that would fail on future versions. For this reason the default behavior +# is to ignore such errors and continue processing commands. +# +# If an application wants to ensure there is no data divergence, this configuration +# should be set to 'panic' instead. The value can also be set to 'panic-on-replicas' +# to only panic when a replica encounters an error on the replication stream. One of +# these two panic values will become the default value in the future once there are +# sufficient safety mechanisms in place to prevent false positive crashes. +# +# propagation-error-behavior ignore + +# Replica ignore disk write errors controls the behavior of a replica when it is +# unable to persist a write command received from its master to disk. By default, +# this configuration is set to 'no' and will crash the replica in this condition. +# It is not recommended to change this default, however in order to be compatible +# with older versions of Redis this config can be toggled to 'yes' which will just +# log a warning and execute the write command it got from the master. +# +# replica-ignore-disk-write-errors no + +# ----------------------------------------------------------------------------- +# By default, Redis Sentinel includes all replicas in its reports. A replica +# can be excluded from Redis Sentinel's announcements. An unannounced replica +# will be ignored by the 'sentinel replicas ' command and won't be +# exposed to Redis Sentinel's clients. +# +# This option does not change the behavior of replica-priority. Even with +# replica-announced set to 'no', the replica can be promoted to master. To +# prevent this behavior, set replica-priority to 0. +# +# replica-announced yes + # It is possible for a master to stop accepting writes if there are less than # N replicas connected, having a lag less or equal than M seconds. # @@ -634,7 +822,7 @@ replica-priority 100 # Redis implements server assisted support for client side caching of values. # This is implemented using an invalidation table that remembers, using -# 16 millions of slots, what clients may have certain subsets of keys. In turn +# a radix key indexed by key name, what clients have which keys. In turn # this is used in order to send invalidation messages to clients. Please # check this page to understand more about the feature: # @@ -698,8 +886,12 @@ replica-priority 100 # off Disable the user: it's no longer possible to authenticate # with this user, however the already authenticated connections # will still work. -# + Allow the execution of that command -# - Disallow the execution of that command +# skip-sanitize-payload RESTORE dump-payload sanitization is skipped. +# sanitize-payload RESTORE dump-payload is sanitized (default). +# + Allow the execution of that command. +# May be used with `|` for allowing subcommands (e.g "+config|get") +# - Disallow the execution of that command. +# May be used with `|` for blocking subcommands (e.g "-config|set") # +@ Allow the execution of all the commands in such category # with valid categories are like @admin, @set, @sortedset, ... # and so forth, see the full list in the server.c file where @@ -707,10 +899,11 @@ replica-priority 100 # The special category @all means all the commands, but currently # present in the server, and that will be loaded in the future # via modules. -# +|subcommand Allow a specific subcommand of an otherwise -# disabled command. Note that this form is not -# allowed as negative like -DEBUG|SEGFAULT, but -# only additive starting with "+". +# +|first-arg Allow a specific first argument of an otherwise +# disabled command. It is only supported on commands with +# no sub-commands, and is not allowed as negative form +# like -SELECT|1, only additive starting with "+". This +# feature is deprecated and may be removed in the future. # allcommands Alias for +@all. Note that it implies the ability to execute # all the future commands loaded via the modules system. # nocommands Alias for -@all. @@ -718,8 +911,17 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. +# %R~ Add key read pattern that specifies which keys can be read +# from. +# %W~ Add key write pattern that specifies which keys can be +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. +# & Add a glob-style pattern of Pub/Sub channels that can be +# accessed by the user. It is possible to specify multiple channel +# patterns. +# allchannels Alias for &* +# resetchannels Flush the list of allowed channel patterns. # > Add this password to the list of valid password for the user. # For example >mypass will add "mypass" to the list. # This directive clears the "nopass" flag (see later). @@ -738,6 +940,14 @@ replica-priority 100 # reset Performs the following actions: resetpass, resetkeys, off, # -@all. The user returns to the same state it has immediately # after its creation. +# () Create a new selector with the options specified within the +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last +# character must be ). +# clearselectors Remove all of the currently attached selectors. +# Note this does not change the "root" user permissions, +# which are the permissions directly applied onto the +# user (outside the parentheses). # # ACL rules can be specified in any order: for instance you can start with # passwords, then flags, or key patterns. However note that the additive @@ -759,6 +969,40 @@ replica-priority 100 # # Basically ACL rules are processed left-to-right. # +# The following is a list of command categories and their meanings: +# * keyspace - Writing or reading from keys, databases, or their metadata +# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, +# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, +# key or metadata will also have `write` category. Commands that only read +# the keyspace, key or metadata will have the `read` category. +# * read - Reading from keys (values or metadata). Note that commands that don't +# interact with keys, will not have either `read` or `write`. +# * write - Writing to keys (values or metadata) +# * admin - Administrative commands. Normal applications will never need to use +# these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc. +# * dangerous - Potentially dangerous (each should be considered with care for +# various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS, +# CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc. +# * connection - Commands affecting the connection or other connections. +# This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc. +# * blocking - Potentially blocking the connection until released by another +# command. +# * fast - Fast O(1) commands. May loop on the number of arguments, but not the +# number of elements in the key. +# * slow - All commands that are not Fast. +# * pubsub - PUBLISH / SUBSCRIBE related +# * transaction - WATCH / MULTI / EXEC related commands. +# * scripting - Scripting related. +# * set - Data type: sets related. +# * sortedset - Data type: zsets related. +# * list - Data type: lists related. +# * hash - Data type: hashes related. +# * string - Data type: strings related. +# * bitmap - Data type: bitmaps related. +# * hyperloglog - Data type: hyperloglog related. +# * geo - Data type: geo related. +# * stream - Data type: streams related. +# # For more information about ACL configuration please refer to # the Redis web site at https://redis.io/topics/acl @@ -788,8 +1032,24 @@ acllog-max-len 128 # AUTH as usually, or more explicitly with AUTH default # if they follow the new protocol: both will work. # +# The requirepass is not compatible with aclfile option and the ACL LOAD +# command, these will cause requirepass to be ignored. +# # requirepass foobared +# New users are initialized with restrictive permissions by default, via the +# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it +# is possible to manage access to Pub/Sub channels with ACL rules as well. The +# default Pub/Sub channels permission if new users is controlled by the +# acl-pubsub-default configuration directive, which accepts one of these values: +# +# allchannels: grants access to all Pub/Sub channels +# resetchannels: revokes access to all Pub/Sub channels +# +# From Redis 7.0, acl-pubsub-default defaults to 'resetchannels' permission. +# +# acl-pubsub-default resetchannels + # Command renaming (DEPRECATED). # # ------------------------------------------------------------------------ @@ -878,14 +1138,12 @@ acllog-max-len 128 # Both LRU, LFU and volatile-ttl are implemented using approximated # randomized algorithms. # -# Note: with any of the above policies, Redis will return an error on write -# operations, when there are no suitable keys for eviction. -# -# At the date of writing these commands are: set setnx setex append -# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd -# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby -# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby -# getset mset msetnx exec sort +# Note: with any of the above policies, when there are no suitable keys for +# eviction, Redis will return an error on write operations that require +# more memory. These are usually commands that create new keys, add data or +# modify existing keys. A few examples are: SET, INCR, HSET, LPUSH, SUNIONSTORE, +# SORT (due to the STORE argument), and EXEC (if the transaction includes any +# command that requires memory). # # The default is: # @@ -902,6 +1160,14 @@ acllog-max-len 128 # # maxmemory-samples 5 +# Eviction processing is designed to function well with the default setting. +# If there is an unusually large amount of write traffic, this value may need to +# be increased. Decreasing this value may reduce latency at the risk of +# eviction processing effectiveness +# 0 = minimum latency, 10 = default, 100 = process without regard to latency +# +# maxmemory-eviction-tenacity 10 + # Starting from Redis 5, by default a replica will ignore its maxmemory setting # (unless it is promoted to master after a failover or manually). It means # that the eviction of keys will be just handled by the master, sending the @@ -937,7 +1203,7 @@ acllog-max-len 128 # more latency), and will tolerate less already expired keys still present # in the system. It's a tradeoff between memory, CPU and latency. # -active-expire-effort 10 +# active-expire-effort 1 ############################# LAZY FREEING #################################### @@ -995,6 +1261,13 @@ replica-lazy-flush no lazyfree-lazy-user-del yes +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. + +lazyfree-lazy-user-flush no + ################################ THREADED I/O ################################# # Redis is mostly single threaded, however there are certain threaded @@ -1019,7 +1292,7 @@ lazyfree-lazy-user-del yes # threads, if you have a 8 cores, try to use 6 threads. In order to # enable I/O threads use the following configuration directive: # -io-threads 6 +io-threads 2 # # Setting io-threads to 1 will just use the main thread as usual. # When I/O threads are enabled, we only use threads for writes, that is @@ -1033,7 +1306,7 @@ io-threads-do-reads yes # Usually threading reads doesn't help much. # # NOTE 1: This configuration directive cannot be changed at runtime via -# CONFIG SET. Aso this feature currently does not work when SSL is +# CONFIG SET. Also, this feature currently does not work when SSL is # enabled. # # NOTE 2: If you want to test the Redis speedup using redis-benchmark, make @@ -1051,7 +1324,7 @@ io-threads-do-reads yes # attempt to have background child processes killed before all others, and # replicas killed before masters. # -# Redis supports three options: +# Redis supports these options: # # no: Don't make changes to oom-score-adj (default). # yes: Alias to "relative" see below. @@ -1072,6 +1345,19 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + +#################### KERNEL transparent hugepage CONTROL ###################### + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". + +disable-thp yes + ############################## APPEND ONLY MODE ############################### # By default Redis asynchronously dumps the dataset on disk. This mode is @@ -1090,14 +1376,43 @@ oom-score-adj-values 0 200 800 # If the AOF is enabled on startup Redis will load the AOF, that is the file # with the better durability guarantees. # -# Please check http://redis.io/topics/persistence for more information. +# Please check https://redis.io/topics/persistence for more information. appendonly no -# The name of the append only file (default: "appendonly.aof") +# The base name of the append only file. +# +# Redis 7 and newer use a set of append-only files to persist the dataset +# and changes applied to it. There are two basic types of files in use: +# +# - Base files, which are a snapshot representing the complete state of the +# dataset at the time the file was created. Base files can be either in +# the form of RDB (binary serialized) or AOF (textual commands). +# - Incremental files, which contain additional commands that were applied +# to the dataset following the previous file. +# +# In addition, manifest files are used to track the files and the order in +# which they were created and should be applied. +# +# Append-only file names are created by Redis following a specific pattern. +# The file name's prefix is based on the 'appendfilename' configuration +# parameter, followed by additional information about the sequence and type. +# +# For example, if appendfilename is set to appendonly.aof, the following file +# names could be derived: +# +# - appendonly.aof.1.base.rdb as a base file. +# - appendonly.aof.1.incr.aof, appendonly.aof.2.incr.aof as incremental files. +# - appendonly.aof.manifest as a manifest file. appendfilename "appendonly.aof" +# For convenience, Redis stores all persistent append-only files in a dedicated +# directory. The name of the directory is determined by the appenddirname +# configuration parameter. + +appenddirname "appendonlydir" + # The fsync() call tells the Operating System to actually write data on disk # instead of waiting for more data in the output buffer. Some OS will really flush # data on disk, some other OS will just try to do it ASAP. @@ -1137,7 +1452,7 @@ appendfsync everysec # BGSAVE or BGREWRITEAOF is in progress. # # This means that while another child is saving, the durability of Redis is -# the same as "appendfsync none". In practical terms, this means that it is +# the same as "appendfsync no". In practical terms, this means that it is # possible to lose up to 30 seconds of log in the worst scenario (with the # default Linux settings). # @@ -1190,34 +1505,69 @@ auto-aof-rewrite-min-size 64mb # will be found. aof-load-truncated yes -# When rewriting the AOF file, Redis is able to use an RDB preamble in the -# AOF file for faster rewrites and recoveries. When this option is turned -# on the rewritten AOF file is composed of two different stanzas: -# -# [RDB file][AOF tail] -# -# When loading, Redis recognizes that the AOF file starts with the "REDIS" -# string and loads the prefixed RDB file, then continues loading the AOF -# tail. +# Redis can create append-only base files in either RDB or AOF formats. Using +# the RDB format is always faster and more efficient, and disabling it is only +# supported for backward compatibility purposes. aof-use-rdb-preamble yes -################################ LUA SCRIPTING ############################### +# Redis supports recording timestamp annotations in the AOF to support restoring +# the data from a specific point-in-time. However, using this capability changes +# the AOF format in a way that may not be compatible with existing AOF parsers. +aof-timestamp-enabled no -# Max execution time of a Lua script in milliseconds. +################################ SHUTDOWN ##################################### + +# Maximum time to wait for replicas when shutting down, in seconds. # -# If the maximum execution time is reached Redis will log that a script is -# still in execution after the maximum allowed time and will start to -# reply to queries with an error. +# During shut down, a grace period allows any lagging replicas to catch up with +# the latest replication offset before the master exists. This period can +# prevent data loss, especially for deployments without configured disk backups. # -# When a long running script exceeds the maximum execution time only the -# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be -# used to stop a script that did not yet call any write commands. The second -# is the only way to shut down the server in the case a write command was -# already issued by the script but the user doesn't want to wait for the natural -# termination of the script. +# The 'shutdown-timeout' value is the grace period's duration in seconds. It is +# only applicable when the instance has replicas. To disable the feature, set +# the value to 0. # -# Set it to 0 or a negative value for unlimited execution without warnings. -lua-time-limit 5000 +# shutdown-timeout 10 + +# When Redis receives a SIGINT or SIGTERM, shutdown is initiated and by default +# an RDB snapshot is written to disk in a blocking operation if save points are configured. +# The options used on signaled shutdown can include the following values: +# default: Saves RDB snapshot only if save points are configured. +# Waits for lagging replicas to catch up. +# save: Forces a DB saving operation even if no save points are configured. +# nosave: Prevents DB saving operation even if one or more save points are configured. +# now: Skips waiting for lagging replicas. +# force: Ignores any errors that would normally prevent the server from exiting. +# +# Any combination of values is allowed as long as "save" and "nosave" are not set simultaneously. +# Example: "nosave force now" +# +# shutdown-on-sigint default +# shutdown-on-sigterm default + +################ NON-DETERMINISTIC LONG BLOCKING COMMANDS ##################### + +# Maximum time in milliseconds for EVAL scripts, functions and in some cases +# modules' commands before Redis can start processing or rejecting other clients. +# +# If the maximum execution time is reached Redis will start to reply to most +# commands with a BUSY error. +# +# In this state Redis will only allow a handful of commands to be executed. +# For instance, SCRIPT KILL, FUNCTION KILL, SHUTDOWN NOSAVE and possibly some +# module specific 'allow-busy' commands. +# +# SCRIPT KILL and FUNCTION KILL will only be able to stop a script that did not +# yet call any write commands, so SHUTDOWN NOSAVE may be the only way to stop +# the server in the case a write command was already issued by the script when +# the user doesn't want to wait for the natural termination of the script. +# +# The default is 5 seconds. It is possible to set it to 0 or a negative value +# to disable this mechanism (uninterrupted execution). Note that in the past +# this config had a different name, which is now an alias, so both of these do +# the same: +# lua-time-limit 5000 +# busy-reply-threshold 5000 ################################ REDIS CLUSTER ############################### @@ -1241,6 +1591,11 @@ lua-time-limit 5000 # # cluster-node-timeout 15000 +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# you to specify the cluster bus port when executing cluster meet. +# cluster-port 0 + # A replica of a failing master will avoid to start a failover if its data # looks too old. # @@ -1299,12 +1654,21 @@ lua-time-limit 5000 # master in your cluster. # # Default is 1 (replicas migrate only if their masters remain with at least -# one replica). To disable migration just set it to a very large value. +# one replica). To disable migration just set it to a very large value or +# set cluster-allow-replica-migration to 'no'. # A value of 0 can be set but is useful only for debugging and dangerous # in production. # # cluster-migration-barrier 1 +# Turning off this option allows to use less automatic cluster configuration. +# It both disables migration to orphaned masters and migration from masters +# that became empty. +# +# Default is 'yes' (allow automatic migrations). +# +# cluster-allow-replica-migration yes + # By default Redis Cluster nodes stop accepting queries if they detect there # is at least a hash slot uncovered (no available node is serving it). # This way if the cluster is partially down (for example a range of hash slots @@ -1319,7 +1683,7 @@ lua-time-limit 5000 # cluster-require-full-coverage yes # This option, when set to yes, prevents replicas from trying to failover its -# master during master failures. However the master can still perform a +# master during master failures. However the replica can still perform a # manual failover, if forced to do so. # # This is useful in different scenarios, especially in the case of multiple @@ -1329,7 +1693,7 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# cluster is in a down state, as long as it believes it owns the slots. # # This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. @@ -1344,8 +1708,54 @@ lua-time-limit 5000 # # cluster-allow-reads-when-down no +# This option, when set to yes, allows nodes to serve pubsub shard traffic while +# the cluster is in a down state, as long as it believes it owns the slots. +# +# This is useful if the application would like to use the pubsub feature even when +# the cluster global stable state is not OK. If the application wants to make sure only +# one shard is serving a given channel, this feature should be kept as yes. +# +# cluster-allow-pubsubshard-when-down yes + +# Cluster link send buffer limit is the limit on the memory usage of an individual +# cluster bus link's send buffer in bytes. Cluster links would be freed if they exceed +# this limit. This is to primarily prevent send buffers from growing unbounded on links +# toward slow peers (E.g. PubSub messages being piled up). +# This limit is disabled by default. Enable this limit when 'mem_cluster_links' INFO field +# and/or 'send-buffer-allocated' entries in the 'CLUSTER LINKS` command output continuously increase. +# Minimum limit of 1gb is recommended so that cluster link buffer can fit in at least a single +# PubSub message by default. (client-query-buffer-limit default value is 1gb) +# +# cluster-link-sendbuf-limit 0 + +# Clusters can configure their announced hostname using this config. This is a common use case for +# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based +# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# the hostname and also propagate the removal. +# +# cluster-announce-hostname "" + +# Clusters can advertise how clients should connect to them using either their IP address, +# a user defined hostname, or by declaring they have no endpoint. Which endpoint is +# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type +# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# will be returned instead. +# +# When a cluster advertises itself as having an unknown endpoint, it's indicating that +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the +# server doesn't know which one the client took. In this case, the server is expecting +# the client to reach out on the same endpoint it used for making the last request, but use +# the port provided in the response. +# +# cluster-preferred-endpoint-type ip + # In order to setup your cluster make sure to read the documentation -# available at http://redis.io web site. +# available at https://redis.io web site. ########################## CLUSTER DOCKER/NAT support ######################## @@ -1355,16 +1765,21 @@ lua-time-limit 5000 # # In order to make Redis Cluster working in such environments, a static # configuration where each node knows its public address is needed. The -# following two options are used for this scope, and are: +# following four options are used for this scope, and are: # # * cluster-announce-ip # * cluster-announce-port +# * cluster-announce-tls-port # * cluster-announce-bus-port # -# Each instructs the node about its address, client port, and cluster message -# bus port. The information is then published in the header of the bus packets -# so that other nodes will be able to correctly map the address of the node -# publishing the information. +# Each instructs the node about its address, client ports (for connections +# without and with TLS) and cluster message bus port. The information is then +# published in the header of the bus packets so that other nodes will be able to +# correctly map the address of the node publishing the information. +# +# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set +# to zero, then cluster-announce-port refers to the TLS port. Note also that +# cluster-announce-tls-port has no effect if cluster-tls is set to no. # # If the above options are not used, the normal Redis Cluster auto-detection # will be used instead. @@ -1377,7 +1792,8 @@ lua-time-limit 5000 # Example: # # cluster-announce-ip 10.1.1.5 -# cluster-announce-port 6379 +# cluster-announce-tls-port 6379 +# cluster-announce-port 0 # cluster-announce-bus-port 6380 ################################## SLOW LOG ################################### @@ -1425,10 +1841,24 @@ slowlog-max-len 128 # "CONFIG SET latency-monitor-threshold " if needed. latency-monitor-threshold 0 +################################ LATENCY TRACKING ############################## + +# The Redis extended latency monitoring tracks the per command latencies and enables +# exporting the percentile distribution via the INFO latencystats command, +# and cumulative latency distributions (histograms) via the LATENCY command. +# +# By default, the extended latency monitoring is enabled since the overhead +# of keeping track of the command latency is very small. +# latency-tracking yes + +# By default the exported latency percentiles via the INFO latencystats command +# are the p50, p99, and p999. +# latency-tracking-info-percentiles 50 99 99.9 + ############################# EVENT NOTIFICATION ############################## # Redis can notify Pub/Sub clients about events happening in the key space. -# This feature is documented at http://redis.io/topics/notifications +# This feature is documented at https://redis.io/topics/notifications # # For instance if keyspace events notification is enabled, and a client # performs a DEL operation on key "foo" stored in the Database 0, two @@ -1450,9 +1880,11 @@ latency-monitor-threshold 0 # z Sorted set commands # x Expired events (events generated every time a key expires) # e Evicted events (events generated when a key is evicted for maxmemory) +# n New key events (Note: not included in the 'A' class) # t Stream commands +# d Module key type events # m Key-miss events (Note: It is not included in the 'A' class) -# A Alias for g$lshzxet, so that the "AKE" string means all the events +# A Alias for g$lshzxetd, so that the "AKE" string means all the events # (Except key-miss events which are excluded from 'A' due to their # unique nature). # @@ -1475,71 +1907,13 @@ latency-monitor-threshold 0 # specify at least one of K or E, no events will be delivered. notify-keyspace-events "" -############################### GOPHER SERVER ################################# - -# Redis contains an implementation of the Gopher protocol, as specified in -# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt). -# -# The Gopher protocol was very popular in the late '90s. It is an alternative -# to the web, and the implementation both server and client side is so simple -# that the Redis server has just 100 lines of code in order to implement this -# support. -# -# What do you do with Gopher nowadays? Well Gopher never *really* died, and -# lately there is a movement in order for the Gopher more hierarchical content -# composed of just plain text documents to be resurrected. Some want a simpler -# internet, others believe that the mainstream internet became too much -# controlled, and it's cool to create an alternative space for people that -# want a bit of fresh air. -# -# Anyway for the 10nth birthday of the Redis, we gave it the Gopher protocol -# as a gift. -# -# --- HOW IT WORKS? --- -# -# The Redis Gopher support uses the inline protocol of Redis, and specifically -# two kind of inline requests that were anyway illegal: an empty request -# or any request that starts with "/" (there are no Redis commands starting -# with such a slash). Normal RESP2/RESP3 requests are completely out of the -# path of the Gopher protocol implementation and are served as usual as well. -# -# If you open a connection to Redis when Gopher is enabled and send it -# a string like "/foo", if there is a key named "/foo" it is served via the -# Gopher protocol. -# -# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher -# talking), you likely need a script like the following: -# -# https://github.com/antirez/gopher2redis -# -# --- SECURITY WARNING --- -# -# If you plan to put Redis on the internet in a publicly accessible address -# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance. -# Once a password is set: -# -# 1. The Gopher server (when enabled, not by default) will still serve -# content via Gopher. -# 2. However other commands cannot be called before the client will -# authenticate. -# -# So use the 'requirepass' option to protect your instance. -# -# Note that Gopher is not currently supported when 'io-threads-do-reads' -# is enabled. -# -# To enable Gopher support, uncomment the following line and set the option -# from no (the default) to yes. -# -# gopher-enabled no - ############################### ADVANCED CONFIG ############################### # Hashes are encoded using a memory efficient data structure when they have a # small number of entries, and the biggest entry does not exceed a given # threshold. These thresholds can be configured using the following directives. -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 +hash-max-listpack-entries 512 +hash-max-listpack-value 64 # Lists are also encoded in a special way to save a lot of space. # The number of entries allowed per internal list node can be specified @@ -1554,7 +1928,7 @@ hash-max-ziplist-value 64 # per list node. # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), # but if your use case is unique, adjust the settings as necessary. -list-max-ziplist-size -2 +list-max-listpack-size -2 # Lists may also be compressed. # Compress depth is the number of quicklist ziplist nodes from *each* side of @@ -1582,8 +1956,8 @@ set-max-intset-entries 512 # Similarly to hashes and lists, sorted sets are also specially encoded in # order to save a lot of space. This encoding is only used when the length and # elements of a sorted set are below the following limits: -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 # HyperLogLog sparse representation bytes limit. The limit includes the # 16 bytes header. When an HyperLogLog using the sparse representation crosses @@ -1605,7 +1979,7 @@ hll-sparse-max-bytes 3000 # maximum number of items it may contain before switching to a new node when # appending new stream entries. If any of the following settings are set to # zero, the limit is ignored, so for instance it is possible to set just a -# max entires limit by setting max-bytes to 0 and max-entries to the desired +# max entries limit by setting max-bytes to 0 and max-entries to the desired # value. stream-node-max-bytes 4096 stream-node-max-entries 100 @@ -1638,7 +2012,7 @@ activerehashing yes # The limit can be set differently for the three different classes of clients: # # normal -> normal clients including MONITOR clients -# replica -> replica clients +# replica -> replica clients # pubsub -> clients subscribed to at least one pubsub channel or pattern # # The syntax of every client-output-buffer-limit directive is the following: @@ -1662,6 +2036,13 @@ activerehashing yes # Instead there is a default limit for pubsub and replica clients, since # subscribers and replicas receive data in a push fashion. # +# Note that it doesn't make sense to set the replica clients output buffer +# limit lower than the repl-backlog-size config (partial sync will succeed +# and then replica will get disconnected). +# Such a configuration is ignored (the size of repl-backlog-size will be used). +# This doesn't have memory consumption implications since the replica client +# will share the backlog buffers memory. +# # Both the hard or the soft limit can be disabled by setting them to zero. client-output-buffer-limit normal 0 0 0 client-output-buffer-limit replica 256mb 64mb 60 @@ -1675,6 +2056,25 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # # client-query-buffer-limit 1gb +# In some scenarios client connections can hog up memory leading to OOM +# errors or data eviction. To avoid this we can cap the accumulated memory +# used by all client connections (all pubsub and normal clients). Once we +# reach that limit connections will be dropped by the server freeing up +# memory. The server will attempt to drop the connections using the most +# memory first. We call this mechanism "client eviction". +# +# Client eviction is configured using the maxmemory-clients setting as follows: +# 0 - client eviction is disabled (default) +# +# A memory value can be used for the client eviction threshold, +# for example: +# maxmemory-clients 1g +# +# A percentage value (between 1% and 100%) means the client eviction threshold +# is based on a percentage of the maxmemory setting. For example to set client +# eviction at 5% of maxmemory: +# maxmemory-clients 5% + # In the Redis protocol, bulk requests, that are, elements representing single # strings, are normally limited to 512 mb. However you can change this limit # here, but must be 1mb or greater @@ -1715,13 +2115,13 @@ hz 10 dynamic-hz yes # When a child rewrites the AOF file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. aof-rewrite-incremental-fsync yes # When redis saves RDB file, if the following option is enabled -# the file will be fsync-ed every 32 MB of data generated. This is useful +# the file will be fsync-ed every 4 MB of data generated. This is useful # in order to commit the file to the disk more incrementally and avoid # big latency spikes. rdb-save-incremental-fsync yes @@ -1876,5 +2276,3 @@ jemalloc-bg-thread yes # to suppress # # ignore-warnings ARM64-COW-BUG - -include /usr/local/etc/redis/redis_replica.conf diff --git a/media/css/reader/status.css b/media/css/reader/status.css index 72b4fc7b7..d0d4dbbff 100644 --- a/media/css/reader/status.css +++ b/media/css/reader/status.css @@ -19,6 +19,6 @@ .NB-status td { border-top: 1px solid #F0F0F0; margin: 0; - padding: 0 0; + padding: 0 6px 0 0; max-width: 300px; } diff --git a/templates/maintenance_off.html b/templates/maintenance_off.html index 1e598fdbf..cb333baa0 100644 --- a/templates/maintenance_off.html +++ b/templates/maintenance_off.html @@ -85,7 +85,7 @@

NewsBlur is in maintenance mode

-

Moving to a larger Redis story DB, since the existing DB is buckling under the new load from the requirements of the new NewsBlur Premium Archive subscription.

+

Moving to another Redis story DB, since the existing DB is having some issues. Check the daily load time graph to see how it's had an impact. Always good to do this, expect fast load times after this.

To pass the time, check out what's popular on MLTSHP.

diff --git a/templates/rss_feeds/status.xhtml b/templates/rss_feeds/status.xhtml index f88a361d1..88f528f8f 100644 --- a/templates/rss_feeds/status.xhtml +++ b/templates/rss_feeds/status.xhtml @@ -2,7 +2,7 @@ {% load utils_tags tz %} -{% block bodyclass %}NB-body-status{% endblock %} +{% block bodyclass %}NB-body-status NB-static{% endblock %} {% block content %} @@ -21,6 +21,7 @@ Last Update
Next Update Min to
next update Decay + Last fetch Subs Active Premium @@ -29,11 +30,13 @@ Act. Prem Per Month Last Month + In Archive + File size (b) {% for feed in feeds %} {{ feed.pk }} - {{ feed.feed_title|truncatewords:4 }} + {{ feed.feed_title|truncatewords:4 }} {{ feed.last_update|smooth_timedelta }} {% localdatetime feed.last_update "%b %d, %Y %H:%M:%S" %} @@ -42,6 +45,7 @@ {{ feed.next_scheduled_update|smooth_timedelta }} {{ feed.min_to_decay }} + {{ feed.last_load_time }} {{ feed.num_subscribers }} {{ feed.active_subscribers }} {{ feed.premium_subscribers }} @@ -50,6 +54,8 @@ {{ feed.active_premium_subscribers }} {{ feed.average_stories_per_month }} {{ feed.stories_last_month }} + {{ feed.archive_count }} + {{ feed.fs_size_bytes|commify }} {% endfor %} diff --git a/templates/statistics/slow.xhtml b/templates/statistics/slow.xhtml new file mode 100644 index 000000000..73a0fc619 --- /dev/null +++ b/templates/statistics/slow.xhtml @@ -0,0 +1,54 @@ +{% extends 'base.html' %} + +{% load utils_tags tz %} + +{% block bodyclass %}NB-body-status NB-static{% endblock %} + +{% block content %} + +
+ +
+ + {% for user_count in user_counts %} + + {% if forloop.first %} + + + {% endfor %} +
Users{% endif %} + {{ user_count.user }}{{ user_count.count }}
+
+
+ + {% for path, count in path_counts.items %} + + {% if forloop.first %} + + + {% endfor %} +
Paths{% endif %} + {{ path }}{{ count }}
+
+
+ + + {% for dt_str, queries in all_queries.items %} + {% for query in queries %} + + {% if forloop.first %} + + {% endif %} + + + + + + + {% endfor %} + {% endfor %} +
+ {% localdatetime query.datetime "%a %b %d, %Y %H:%M" %} + {{ query.user }}{{ query.time }}{{ query.method }}{{ query.path }}{% if query.data %}{{ query.data }}{% endif %}
+ +{% endblock content %} diff --git a/terraform/digitalocean.tf b/terraform/digitalocean.tf index 10c96a3ef..b29b306a4 100644 --- a/terraform/digitalocean.tf +++ b/terraform/digitalocean.tf @@ -380,11 +380,12 @@ resource "digitalocean_droplet" "db-redis-sessions" { } resource "digitalocean_droplet" "db-redis-story" { - count = 1 + count = 2 image = var.droplet_os name = "db-redis-story${count.index+1}" region = var.droplet_region size = contains([1], count.index) ? "m-8vcpu-64gb" : var.redis_story_droplet_size + # size = var.redis_story_droplet_size ssh_keys = [digitalocean_ssh_key.default.fingerprint] provisioner "local-exec" { command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120" @@ -466,12 +467,13 @@ resource "digitalocean_droplet" "db-postgres" { # servers=$(for i in {1..9}; do echo -n "-target=\"digitalocean_droplet.db-mongo-primary[$i]\" " ; done); tf plan -refresh=false `eval echo $servers` # resource "digitalocean_droplet" "db-mongo-primary" { - count = 1 + count = 2 backups = contains([0], count.index) ? false : true image = var.droplet_os name = "db-mongo-primary${count.index+1}" region = var.droplet_region - size = contains([1], count.index) ? "m3-8vcpu-64gb" : var.mongo_primary_droplet_size + # size = contains([1], count.index) ? "m3-8vcpu-64gb" : var.mongo_primary_droplet_size + size = var.mongo_primary_droplet_size ssh_keys = [digitalocean_ssh_key.default.fingerprint] provisioner "local-exec" { command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120" diff --git a/terraform/variables.tf b/terraform/variables.tf index 22809850f..2cf068362 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -89,5 +89,5 @@ variable "elasticsearch_droplet_size" { variable "redis_story_droplet_size" { type = string - default = "m-8vcpu-64gb" + default = "m-4vcpu-32gb" } diff --git a/utils/request_introspection_middleware.py b/utils/request_introspection_middleware.py index 39d7553b7..7ec0bdf03 100644 --- a/utils/request_introspection_middleware.py +++ b/utils/request_introspection_middleware.py @@ -1,11 +1,17 @@ from django.conf import settings from utils import log as logging +from apps.statistics.rstats import round_time +import pickle +import base64 import time +import redis IGNORE_PATHS = [ "/_haproxychk", ] +RECORD_SLOW_REQUESTS_ABOVE_SECONDS = 10 + class DumpRequestMiddleware: def process_request(self, request): if settings.DEBUG and request.path not in IGNORE_PATHS: @@ -40,22 +46,31 @@ class DumpRequestMiddleware: redis_log )) - return response - - def elapsed_time(self, request): - time_elapsed = "" if hasattr(request, 'start_time'): seconds = time.time() - request.start_time - color = '~FB' - if seconds >= 1: - color = '~FR' - elif seconds > .2: - color = '~SB~FK' - time_elapsed = "[%s%.4ss~SB] " % ( - color, - seconds, - ) - return time_elapsed + if seconds > RECORD_SLOW_REQUESTS_ABOVE_SECONDS: + r = redis.Redis(connection_pool=settings.REDIS_STATISTICS_POOL) + pipe = r.pipeline() + minute = round_time(round_to=60) + name = f"SLOW:{minute.strftime('%s')}" + user_id = request.user.pk if request.user.is_authenticated else "0" + data_string = None + if request.method == "GET": + data_string = ' '.join([f"{key}={value}" for key, value in request.GET.items()]) + elif request.method == "GET": + data_string = ' '.join([f"{key}={value}" for key, value in request.POST.items()]) + data = { + "user_id": user_id, + "time": round(seconds, 2), + "path": request.path, + "method": request.method, + "data": data_string, + } + pipe.lpush(name, base64.b64encode(pickle.dumps(data)).decode('utf-8')) + pipe.expire(name, 60*60*12) # 12 hours + pipe.execute() + + return response def color_db(self, seconds, default): color = default