From bbfbe97f838dd1b383abbfc58664d93092374642 Mon Sep 17 00:00:00 2001 From: zhmin Date: Wed, 12 Dec 2018 17:25:01 +0800 Subject: [PATCH] fix spped config check --- .../alibaba/datax/core/job/JobContainer.java | 4 ++-- introduction.md | 21 +++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/alibaba/datax/core/job/JobContainer.java b/core/src/main/java/com/alibaba/datax/core/job/JobContainer.java index 50f1cf7b..26b2989f 100755 --- a/core/src/main/java/com/alibaba/datax/core/job/JobContainer.java +++ b/core/src/main/java/com/alibaba/datax/core/job/JobContainer.java @@ -427,7 +427,7 @@ public class JobContainer extends AbstractContainer { Long channelLimitedByteSpeed = this.configuration .getLong(CoreConstant.DATAX_CORE_TRANSPORT_CHANNEL_SPEED_BYTE); if (channelLimitedByteSpeed == null || channelLimitedByteSpeed <= 0) { - DataXException.asDataXException( + throw DataXException.asDataXException( FrameworkErrorCode.CONFIG_ERROR, "在有总bps限速条件下,单个channel的bps值不能为空,也不能为非正数"); } @@ -448,7 +448,7 @@ public class JobContainer extends AbstractContainer { Long channelLimitedRecordSpeed = this.configuration.getLong( CoreConstant.DATAX_CORE_TRANSPORT_CHANNEL_SPEED_RECORD); if (channelLimitedRecordSpeed == null || channelLimitedRecordSpeed <= 0) { - DataXException.asDataXException(FrameworkErrorCode.CONFIG_ERROR, + throw DataXException.asDataXException(FrameworkErrorCode.CONFIG_ERROR, "在有总tps限速条件下,单个channel的tps值不能为空,也不能为非正数"); } diff --git a/introduction.md b/introduction.md index b27607c7..c4957964 100644 --- a/introduction.md +++ b/introduction.md @@ -105,10 +105,23 @@ DataX 3.0 开源版本支持单机多线程模式完成同步作业运行,本 还在为同步过程对在线存储压力影响而担心吗?新版本DataX3.0提供了包括通道(并发)、记录流、字节流三种流控模式,可以随意控制你的作业速度,让你的作业在库可以承受的范围内达到最佳的同步速度。 ```json - "speed": { - "channel": 5, - "byte": 1048576, - "record": 10000 + { + "core": { + "transport" : { + "channel": { + "speed": { + "record": 100 + } + } + } + }, + "job": { + "setting": { + "speed": { + "channel": 5 + } + } + } } ```