This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 1d8efb7788 JAMES-4124 Upgrade Rspamd to 3.12.0
1d8efb7788 is described below
commit 1d8efb7788217960899bb6a67b1005f791f858a0
Author: Quan Tran <hqt...@linagora.com>
AuthorDate: Thu Jun 12 10:33:31 2025 +0700
JAMES-4124 Upgrade Rspamd to 3.12.0
Which would allow Rspamd to execute EVASHA_RO commands against Kvrocks
replicas (instead of EVASHA which Kvrocks replicas reject ATM).
cf: https://github.com/rspamd/rspamd/pull/5419
---
third-party/rspamd/docker-compose-distributed.yml | 2 +-
third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml | 2 +-
third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml | 2 +-
third-party/rspamd/docker-compose-rspamd-with-redis-sentinel.yml | 2 +-
third-party/rspamd/docker-compose.yml | 2 +-
.../sample-configuration/kvrocks/sentinel/replica-node/kvrocks.conf | 3 ++-
third-party/rspamd/sample-configuration/rspamd-kvrocks-sentinel.conf | 3 ++-
.../rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java | 2 +-
8 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/third-party/rspamd/docker-compose-distributed.yml
b/third-party/rspamd/docker-compose-distributed.yml
index 421593015e..1c0a06576b 100644
--- a/third-party/rspamd/docker-compose-distributed.yml
+++ b/third-party/rspamd/docker-compose-distributed.yml
@@ -108,7 +108,7 @@ services:
redis:
condition: service_started
container_name: rspamd
- image: rspamd/rspamd:3.9.1
+ image: rspamd/rspamd:3.12.0
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
index ac452f3877..8a7683df81 100644
--- a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
+++ b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-sentinel.yml
@@ -103,7 +103,7 @@ services:
kvrocks-master:
condition: service_healthy
container_name: rspamd
- image: rspamd/rspamd:3.11.1 # Rspamd version >= 3.10 is needed to fix the
Redis read-only issue when Rspamd gets bayes statistics too.
+ image: rspamd/rspamd:3.12.0
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git
a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
index 6a1e5e0eb9..04fa191608 100644
--- a/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
+++ b/third-party/rspamd/docker-compose-rspamd-with-kvrocks-standalone.yml
@@ -54,7 +54,7 @@ services:
kvrocks:
condition: service_started
container_name: rspamd
- image: rspamd/rspamd:3.9.1
+ image: rspamd/rspamd:3.12.0
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git a/third-party/rspamd/docker-compose-rspamd-with-redis-sentinel.yml
b/third-party/rspamd/docker-compose-rspamd-with-redis-sentinel.yml
index 51331b1527..41e91cb213 100644
--- a/third-party/rspamd/docker-compose-rspamd-with-redis-sentinel.yml
+++ b/third-party/rspamd/docker-compose-rspamd-with-redis-sentinel.yml
@@ -102,7 +102,7 @@ services:
redis-master:
condition: service_healthy
container_name: rspamd
- image: rspamd/rspamd:3.9.1
+ image: rspamd/rspamd:3.12.0
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git a/third-party/rspamd/docker-compose.yml
b/third-party/rspamd/docker-compose.yml
index 8e396e0ed7..012df2c5c5 100644
--- a/third-party/rspamd/docker-compose.yml
+++ b/third-party/rspamd/docker-compose.yml
@@ -45,7 +45,7 @@ services:
redis:
condition: service_started
container_name: rspamd
- image: rspamd/rspamd:3.9.1
+ image: rspamd/rspamd:3.12.0
environment:
- RSPAMD_PASSWORD=admin
volumes:
diff --git
a/third-party/rspamd/sample-configuration/kvrocks/sentinel/replica-node/kvrocks.conf
b/third-party/rspamd/sample-configuration/kvrocks/sentinel/replica-node/kvrocks.conf
index 56a34f8d9b..95f11e859c 100644
---
a/third-party/rspamd/sample-configuration/kvrocks/sentinel/replica-node/kvrocks.conf
+++
b/third-party/rspamd/sample-configuration/kvrocks/sentinel/replica-node/kvrocks.conf
@@ -10,4 +10,5 @@ port 6379
# This allows Rspamd to execute EVALSHA read-only Lua script on Kvrocks
replicas to get the BAYES statistics.
# Cautious: This would allow Kvrocks replicas to be writable, therefore we
need to carefully configure Rspamd or whatever app to use the correct
master/replicas Kvrocks endpoints.
# There is also a small time window upon Redis Sentinel failover that Rspamd
could write to the old master (new replica). We could very likely accept that
for spam learning data.
-slave-read-only no
+# Only needed if Rspamd < 3.12.0
+# slave-read-only no
diff --git
a/third-party/rspamd/sample-configuration/rspamd-kvrocks-sentinel.conf
b/third-party/rspamd/sample-configuration/rspamd-kvrocks-sentinel.conf
index 5c15e14062..4451eb6863 100644
--- a/third-party/rspamd/sample-configuration/rspamd-kvrocks-sentinel.conf
+++ b/third-party/rspamd/sample-configuration/rspamd-kvrocks-sentinel.conf
@@ -3,4 +3,5 @@ sentinels =
"sentinel-1:26379,sentinel-2:26379,sentinel-3:26379";
password = "secret1";
sentinel_watch_time = 10s; # How often Rspam will query sentinels for masters
and slaves
sentinel_masters_pattern = "^mymaster.*$"; # Defines masters pattern to match
in Lua syntax (no pattern means all masters)
-timeout = 5s;
\ No newline at end of file
+timeout = 5s;
+redis_version = 7; # Allow Rspamd to execute the EVALSHA_RO command against
Kvrocks replicas. cf https://github.com/rspamd/rspamd/pull/5419
\ No newline at end of file
diff --git
a/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
b/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
index df47c0129b..ba0897b248 100644
---
a/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
+++
b/third-party/rspamd/src/test/java/org/apache/james/rspamd/RspamdExtension.java
@@ -40,7 +40,7 @@ public class RspamdExtension implements
GuiceModuleTestExtension {
public static final Duration STARTUP_TIMEOUT = Duration.ofMinutes(5);
public static final String PASSWORD = "admin";
- private static final DockerImageName RSPAMD_IMAGE =
DockerImageName.parse("rspamd/rspamd").withTag("3.9.1");
+ private static final DockerImageName RSPAMD_IMAGE =
DockerImageName.parse("rspamd/rspamd").withTag("3.12.0");
private static final DockerImageName REDIS_IMAGE =
DockerImageName.parse("apache/kvrocks").withTag("2.11.1");
private static final DockerImageName CLAMAV_IMAGE =
DockerImageName.parse("clamav/clamav").withTag("1.3");
private static final int RSPAMD_DEFAULT_PORT = 11334;
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
