From e23bd6627ef4a7b5979f8e0168c841a6fa79aea6 Mon Sep 17 00:00:00 2001 From: Gaius Date: Mon, 19 May 2025 19:19:09 +0800 Subject: [PATCH] feat: update machinery to v1.10.14 and adjust Redis config (#4075) Signed-off-by: Gaius --- go.mod | 2 +- go.sum | 4 ++-- internal/job/constants.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5f40bf851..5cec3c835 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/docker/docker v28.1.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.4.0 - github.com/dragonflyoss/machinery v1.10.13 + github.com/dragonflyoss/machinery v1.10.14 github.com/elastic/go-freelru v0.16.0 github.com/fsouza/fake-gcs-server v1.52.2 github.com/gaius-qi/ping v1.0.0 diff --git a/go.sum b/go.sum index 07cb72fe5..6938a771d 100644 --- a/go.sum +++ b/go.sum @@ -441,8 +441,8 @@ github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arX github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dragonflyoss/machinery v1.10.13 h1:0iixzz4rn+oDIDHLz8sj5sQ5veTVg+Z1TOVKm2nnWv8= -github.com/dragonflyoss/machinery v1.10.13/go.mod h1:YUhavio0FVIsY9e3mVrj7weroc08gWm1hiauPDu1S28= +github.com/dragonflyoss/machinery v1.10.14 h1:VoR+ti+PsradoaVTIBT8rC8afXkEIzBp4G/+5m32Nrc= +github.com/dragonflyoss/machinery v1.10.14/go.mod h1:YUhavio0FVIsY9e3mVrj7weroc08gWm1hiauPDu1S28= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= diff --git a/internal/job/constants.go b/internal/job/constants.go index 13ef16b8d..6b853a821 100644 --- a/internal/job/constants.go +++ b/internal/job/constants.go @@ -40,12 +40,12 @@ const ( // Machinery server configuration. const ( DefaultResultsExpireIn = 86400 - DefaultRedisMaxIdle = 0 - DefaultRedisMaxActive = 300 + DefaultRedisMaxIdle = 10 + DefaultRedisMaxActive = 50 DefaultRedisIdleTimeout = 30 DefaultRedisReadTimeout = 60 DefaultRedisWriteTimeout = 60 DefaultRedisConnectTimeout = 60 - DefaultRedisNormalTasksPollPeriod = 2000 + DefaultRedisNormalTasksPollPeriod = 2500 DefaultRedisDelayedTasksPollPeriod = 500 )