From fb231adea385864efc1e2e94ed8ed4e1afd4f607 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Thu, 27 Feb 2025 23:07:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/docker/docker-compose.yaml | 2 +- .../server/common/generator/id/SegmentIdGenerator.java | 1 + .../server/retry/task/support/dispatch/ScanRetryActor.java | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/docker/docker-compose.yaml b/doc/docker/docker-compose.yaml index c95c8fa74..f29e7e1b4 100644 --- a/doc/docker/docker-compose.yaml +++ b/doc/docker/docker-compose.yaml @@ -105,7 +105,7 @@ services: - "5236:5236" volumes: - dm8:/opt/dmdbms/data - # docker compose exec dm8 bash -c "/opt/dmdbms/bin/disql SYSDBA/SYSDBA001 \`/tmp/schema.sql" + # docker compose exec dm8 bash -c "/opt/dmdbms/bin/disql SYSDBA/SYSDBA_dm001 \`/tmp/schema.sql" - ../sql/snail_job_dm8.sql:/tmp/schema.sql:ro kingbase: diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java index 43dfdd5c9..7e390bce4 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicLong; */ @Component @Slf4j +@Deprecated public class SegmentIdGenerator implements IdGenerator, Lifecycle { /** diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java index c5935553b..3081a7790 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java @@ -93,9 +93,7 @@ public class ScanRetryActor extends AbstractActor { return true; } - boolean b = rateLimiterHandler.tryAcquire(partitionTasks.size()); - log.warn("获取令牌, b:[{}] size:[{}]", b, partitionTasks.size()); - if (!b) { + if (!rateLimiterHandler.tryAcquire(partitionTasks.size())) { log.warn("当前节点触发限流"); return true; }